Merge branch 'bug_8942' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:29:01 +0000 (10:29 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:29:01 +0000 (10:29 -0500)
commit9b8a5274732edd0bbcf3dd80b82c00b182a292da
treeae8af07a4234f9317520518cfbce529d48bb6401
parent5f40f3f0e424646bbfd4fa8a9f472b06d8124606
parent27a3d083315da37abe17207be2a895709eaff123
Merge branch 'bug_8942' into 3.12-master