Merge branch 'bug_6261' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 27 Dec 2012 23:37:28 +0000 (18:37 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 27 Dec 2012 23:37:28 +0000 (18:37 -0500)
commit9837f19f10dd9e4e2306c39f11e964b18b9dafaa
tree9bc44821d63386b7ee25fd4a489ee44b317c4f23
parent25232635f538ffb5582f56536c242d48f433018b
parent8fd75227fcd87d2cea5d0cb31d7af72498fbb24d
Merge branch 'bug_6261' into 3.12-master