Merge branch 'bug_7143' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:22:17 +0000 (23:22 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:22:17 +0000 (23:22 -0500)
commit6ba61ab3e06c806e0713773cbc2ac468b9b5f2e0
treee8cfe505250799e217d736f939f14134a469e590
parent5ea98ade5de972abef5bed82a53518d45c0fcd8a
parent7e1a341d4e901e660d80cef710faed66452c1749
Merge branch 'bug_7143' into 3.12-master