Merge branch 'bug_9534' into 3.12-master
commite994b36a782938026fa63195cbb1f10e087b1057
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 01:28:02 +0000 (30 21:28 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 31 Mar 2013 01:28:02 +0000 (30 21:28 -0400)
tree3c38f0c23e87a080d804e5b08e42b30f1318207a
parent91e09b98d297b4ca7a9b818105448f0f0db0043d
parent38553197f7706678d9fd6f55b70ae21bea00fe13
Merge branch 'bug_9534' into 3.12-master