Merge branch 'bug_8984' into 3.12-master master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 4 Jan 2013 13:40:00 +0000 (08:40 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 4 Jan 2013 13:40:00 +0000 (08:40 -0500)
commit588a55a581cdedfb4962a0ef6418c81f6428a6ee
tree638c1f3c2f82c0447d17c27f432ffe59610ad6e9
parent70487e8740efa5375e892404d45a7bbd4caed817
parente86e3c24b841e7e79416d0ac55199f29bd9e8d1e
Merge branch 'bug_8984' into 3.12-master