Merge branch 'bug_9535' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 3 Apr 2013 10:09:08 +0000 (06:09 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 3 Apr 2013 10:09:08 +0000 (06:09 -0400)

Trivial merge