Merge branch 'bug_8997' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:20:23 +0000 (07:20 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:20:23 +0000 (07:20 -0500)
commita3ac7fe48b44e77cb97ef91f364073683d74eab8
treedb710e25b9e7daa86e6acd96cc0e366d29c9e41b
parent982a1d7e1ba5676c5c47946ffd3cf20260c8a14b
parente2cf59ac581fad905ee30c3abe00784a7521f1ee
Merge branch 'bug_8997' into 3.12-master