Merge branch 'bug_9284' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 28 Dec 2012 00:02:31 +0000 (19:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 28 Dec 2012 00:02:31 +0000 (19:02 -0500)
commitfa87f18549394dc4e0009844bbaa84542d4c12e5
treed26e2d64b735ac9b45c501103a13a263f6695c2b
parentc3bf2b4a3c04d43a3bb3c2e0571d591bc5060341
parent04d982571774f1a0fcd0ad30705163ba0218549d
Merge branch 'bug_9284' into 3.12-master