Merge branch 'bug_7189' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 13:02:14 +0000 (08:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 13:02:14 +0000 (08:02 -0500)
commiteb570a205206742ffcc03c0c8c99fb1866d733bd
tree55979d749f0545140ed14b04329ab42e2f2cb919
parentef96f0686dbf76bcf133a1923693f30e2ea7212a
parent2a9de22e2aa034e8815666b79713d86ed933b783
Merge branch 'bug_7189' into 3.12-master