Merge branch 'bug_9308' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:44:51 +0000 (11:44 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:44:51 +0000 (11:44 -0500)
commita8355cef85fb3df33d45b9d2069c07fdbb6fa795
tree914bd4df273791b69d21020cbda9536f28f64d68
parente0961be45e273e0854cadab20426ff1a8d016ab0
parent8f661902154d4f60a6c2d2a65a12be567a8826c3
Merge branch 'bug_9308' into 3.12-master