Merge branch 'bug_9283' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 14:48:37 +0000 (09:48 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 14:48:37 +0000 (09:48 -0500)
commitf481d9259d889f74dd556e17ed6d4aa9a3a7f50a
tree774eb44553edec8b65a1eae11651280565bccc48
parentf66162592e001bdc13dcfc5426820f7a8b915b9b
parentd68b8357d75cf2808d82a86ff5d6582403e6c51a
Merge branch 'bug_9283' into 3.12-master