Merge branch 'bug_9556' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 13:37:25 +0000 (08:37 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 13:37:25 +0000 (08:37 -0500)
commit723dadcf7a34452da55e38c0cdb83ae7201a370d
treea034c2333f252d1053c45aad1b1ca6fa12c2a822
parent375873d22108ee3c2447bad44f929c1f7aac1810
parent9912e384043df1224a5a1735a8f3fec3caddd8fc
Merge branch 'bug_9556' into 3.12-master