Merge branch 'bug_8299' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 27 Dec 2012 23:50:50 +0000 (18:50 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 27 Dec 2012 23:50:50 +0000 (18:50 -0500)
commitc3bf2b4a3c04d43a3bb3c2e0571d591bc5060341
treeed10595a076dde81167cd6fafc98df3041ebfa8b
parentbfb0d7e13025cc7624d431635baa1dfc1712c4ad
parentdd5023e6d469961b533fb51f02e22ac434d9790c
Merge branch 'bug_8299' into 3.12-master