Merge branch 'bug_9382' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:34:24 +0000 (11:34 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:34:24 +0000 (11:34 -0500)
commitdc1e0783f53577e882f828929e7751d6ad5022af
tree03f13e3a5b4e7bf891f1b48eae4bd9c1c14dd909
parentd255a4166f5a64d09e5b372036d8929f24bb6e52
parenteb4a24d9724482513e778921cb131fdb2fff7cb5
Merge branch 'bug_9382' into 3.12-master