Merge branch 'bug_9695' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:43:45 +0000 (08:43 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:43:45 +0000 (08:43 -0400)
commitb4ba0d12df19083724b67df0ec99ee03efb11e05
tree64eacd6a9ae489d1b2310ead18cf63e90823c465
parent2e5198ea47342e592ae437bdaf2dd79c96a9eaef
parentd3663a1c3870f732e4d9f18011e4a38f7be6b237
Merge branch 'bug_9695' into 3.12-master