Merge branch 'bug_7804' into 3.12-master
commitfb28e0e53dd8cbfe02eb84bfe146bd1456741dde
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 18:51:23 +0000 (20 14:51 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 18:51:23 +0000 (20 14:51 -0400)
tree72b5f0ab979698ad404894257c6e1d2ed7f6730b
parent9e8bf67a3162dae3d6f0ff265ccc688346b113e2
parent0ab317559e3ef4e29ac3e192d59bff72460bb99d
Merge branch 'bug_7804' into 3.12-master