Merge branch 'bug_9020' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:36:09 +0000 (18:36 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:36:09 +0000 (18:36 -0500)
commit7e25faace8d70c2e81272cb3eacd41fa7215719d
tree43591e411716e2966bd073787682f8ed63ada396
parentdb15627b7a6f8bb61f408e20b14bafd901e65cf7
parenta853db6adb6aadbc3779f7e20115ecccb738ec1e
Merge branch 'bug_9020' into 3.12-master