Merge branch 'bug_9046' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:32:29 +0000 (07:32 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:32:29 +0000 (07:32 -0500)
commitd44b552b3f22c7423038f831d622bfe67a543936
tree8d44d17bda9242efc50d35dcca951b33cfc453ee
parentfdde1586783ce5e049469ef3595dd1cef4abc6a4
parentff61e9f16fc26e3299adf8d724f50e31c478c365
Merge branch 'bug_9046' into 3.12-master