Merge branch 'bug_9292' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 13 Jan 2013 13:39:00 +0000 (08:39 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 13 Jan 2013 13:39:00 +0000 (08:39 -0500)
commit73d84bc3620b7713dda78dce885ee43fa886ec43
tree2a65ae11551100cb2320f32687ca32e3367ffa4b
parent863a7c429d313fad2a14d5be486f0d6dabfc12d6
parenta1e9e3d8d9af4b0924ec45ac05f61bfc3ea9c038
Merge branch 'bug_9292' into 3.12-master