Merge branch 'bug_9293' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 21:59:29 +0000 (17:59 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 21:59:29 +0000 (17:59 -0400)

Trivial merge