Merge branch 'bug_7253' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 15:00:46 +0000 (10:00 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 15:00:46 +0000 (10:00 -0500)
commitb60a8397c15a321cec37f6a3b2fa4612631a103e
tree0dd687bbf7e18826dbf49e9103c578cdfc08bfbc
parent7a14dca14fe7feac6b2b9d857cf1dafa26f29fa7
parent5c627db14fec13da692d21abe1bb223e70bdf5ca
Merge branch 'bug_7253' into 3.12-master