Merge branch 'bug_9685' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:30:38 +0000 (17:30 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:30:38 +0000 (17:30 -0400)
commit5e8aabe678e5526aa22a9bc29d9160a43e7dd176
treeff0141aa744415ff96599d4eb48a20e192845f3c
parentb3aace1d82adb9324b881cd81cea792c929b9cd0
parent6df7652ac8a1492b45cd6573ad56a4ef00e727d0
Merge branch 'bug_9685' into 3.12-master