Merge branch 'bug_9884' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 11:49:11 +0000 (07:49 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 11:49:11 +0000 (07:49 -0400)
commit12d4456db80156b79900a7c38b7342550fa7bfa5
treec74bdfd4aef2ba57ddda3637747814c06e1c0081
parentc8eb5eab63b04fdc8406dc2e45ed4032456a48ab
parentd95f04313d8fdf9cb211b03143e2a8ed0124c72a
Merge branch 'bug_9884' into 3.12-master