Merge branch 'bug_5888' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 14:52:35 +0000 (09:52 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 14:52:35 +0000 (09:52 -0500)
commit43295d9834bb3b64d41b1d6febd2905d94ba8600
treed037f6919994144cc6e258fa80c36b4d02b5d9fb
parentb2a77e87f826d97a672a4410e54072bf726d2a46
parentda9046fceba7d2f5c4c39fea98f6c781e6db058c
Merge branch 'bug_5888' into 3.12-master