Merge branch 'bug_9698' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:52:22 +0000 (09:52 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:52:22 +0000 (09:52 -0500)
commit424bf484eab4db22bb545b3f1fc087ea0b0050aa
treed94d28906fdd2ea39fa3de10603afe45f0db162c
parent821d0aa1c31f845d6d8b2329e7518a4c58b85975
parentbf19223a79e869f6dd7a35d57df2ee1337067916
Merge branch 'bug_9698' into 3.12-master