Merge branch 'bug_7593' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 14 May 2013 17:46:12 +0000 (13:46 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 14 May 2013 17:46:12 +0000 (13:46 -0400)

Trivial merge