Merge branch 'bug_9574' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:17:53 +0000 (09:17 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:17:53 +0000 (09:17 -0500)
commitbacfa564267ca1f3f31e3c606f950961c78c5c52
tree64d7618111cf4256a52af94d8f09292062291473
parent1f88190fdd7cfc4eb17406555f905bd59afc82ce
parent4a84038a86a2b7c36f5d6dee7cdb0c4c31bee71d
Merge branch 'bug_9574' into 3.12-master