Merge branches '3.12-master' and 'bug_7143' into bug_7143
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:21:29 +0000 (23:21 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:21:29 +0000 (23:21 -0500)
commit594343bbd9fe97330843c979e4a902a10500422f
treefae5e1dfd0f27315f62433d81198e292ff130be4
parent5ea98ade5de972abef5bed82a53518d45c0fcd8a
Merge branches '3.12-master' and 'bug_7143' into bug_7143