Merge branch 'bug_9509' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 5 Feb 2013 12:36:20 +0000 (07:36 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 5 Feb 2013 12:36:20 +0000 (07:36 -0500)
commitf17c016dfb71466923526128e9e0f4773b394f4c
tree0253265f6bd960619d984c7d422b8f4aa8fbde7e
parentafe27a94ad728c54f1067829e05c741f68d7e4c5
parent11feabf09b56c4a8756c882b289bc9d3bbf10ab0
Merge branch 'bug_9509' into 3.12-master