Merge branch 'bug_7593' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:30:57 +0000 (10:30 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 12 May 2013 14:30:57 +0000 (10:30 -0400)

Trivial merge