Merge branch 'bug_7368' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:24:55 +0000 (07:24 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:24:55 +0000 (07:24 -0500)
commitfdde1586783ce5e049469ef3595dd1cef4abc6a4
treec73022542f4a92bd7b3b08d6b119a754418531ef
parenta3ac7fe48b44e77cb97ef91f364073683d74eab8
parentd3b50910dabf490c22287e348ccb8c50bdb4a6bf
Merge branch 'bug_7368' into 3.12-master