Merge branch 'bug_8800' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 22 Nov 2012 14:20:07 +0000 (09:20 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 22 Nov 2012 14:20:07 +0000 (09:20 -0500)
commitf7fabc661cbd7ba1a79e4e1e93911316714e3d68
treea65447644f8a6186555ea04bb4a9e50bd1bebdbe
parent64b9bc74bfd8219b14f16847702cb7be5c4660db
parent7b18e2146cbb1f4d0f9a87002e5ec8580bc188d6
Merge branch 'bug_8800' into 3.12-master