Merge branch 'bug_6835' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 16:08:33 +0000 (11:08 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 16:08:33 +0000 (11:08 -0500)
commit350fcf23a5ce63a62bf45fd29a3fcd14a0c4cbcb
tree8976b195669057ebd4da8184db0989e96fa91a74
parentaf877803851e1d65fa738cf2c4be465f7054248d
parentf2290475492755c84fd201c6ea81b46d7f0ab161
Merge branch 'bug_6835' into 3.12-master