Merge branch 'bug_7143' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:24:54 +0000 (08:24 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:24:54 +0000 (08:24 -0500)
commit6081b94e3c3af21e90f14b73611216d1c4cbd31d
treed5a44d4d90cb8ac13b9aae2b4e07348106462829
parentbc9cb5b47828f9920a9485ca2c97cc292bbb30dd
parentbd63817139f3011afdaa23a93adc41966e28a3f3
Merge branch 'bug_7143' into 3.12-master