Merge branch 'bug_9694' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:57:38 +0000 (09:57 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:57:38 +0000 (09:57 -0500)
commitf1d8191499f795be48d4cb064d0dce9de791739c
treeb64a5e2ef08ffc513d813d7ce7f2942b4918c7ec
parente2c2fe675196efe65a01e99e61308a07ba0bc80c
parentfc26ee3bae2f1255a6ae7707fffb7ff4da64fcc5
Merge branch 'bug_9694' into 3.12-master