Merge branch 'bug_10000' into 3.14-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 13:18:18 +0000 (09:18 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 18 Apr 2013 13:18:18 +0000 (09:18 -0400)

Trivial merge