Merge branch 'bug_9693' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:03:48 +0000 (10:03 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:03:48 +0000 (10:03 -0500)
commitfe85b19ac6ac60ce832e4a6acfb51c1d0be54419
tree0fb3d920a1cf27f2c1067f72be8ae1beb65b3932
parentf1d8191499f795be48d4cb064d0dce9de791739c
parent4334cd195af90255c0d59695310049e2e6a04898
Merge branch 'bug_9693' into 3.12-master