Merge branch 'bug_9642' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:06:49 +0000 (09:06 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 14:06:49 +0000 (09:06 -0500)
commit0176d1098d245996c424c2696b0a6b0fd04e767b
treec8b06c07172798a4ab43f2c3f03bb5cde6f67ac8
parent4ad8e4116fc1e362c106c4e7b45430eb5ecb9909
parent775ed7d0bc4446b543ebe6e997175ff1bf73d4a0
Merge branch 'bug_9642' into 3.12-master