Merge branch 'bug_8945' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 2 Nov 2012 16:00:32 +0000 (12:00 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 2 Nov 2012 16:00:32 +0000 (12:00 -0400)
commit369c5382a48ab2faab1f49e710681681e718ab40
tree0ffc8f64c7cfbf3bac97a5506336330c07bfbceb
parent5b8e1548e44b66b8d9206b206ee0e768d3c5c12b
parentbe0f16aaac1a5dd2c18c0ba18d388de67fe1c467
Merge branch 'bug_8945' into 3.12-master