Merge branch 'bug_9696' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:55:24 +0000 (09:55 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:55:24 +0000 (09:55 -0500)
commite2c2fe675196efe65a01e99e61308a07ba0bc80c
tree34dd133f89e0bb995b7ef412e8e20ab62b1e9a50
parent424bf484eab4db22bb545b3f1fc087ea0b0050aa
parent2c01d28c401c47ad13d2b63e459c6548045b6452
Merge branch 'bug_9696' into 3.12-master