Merge branch 'bug_7678' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 22 Jan 2013 23:35:22 +0000 (18:35 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 22 Jan 2013 23:35:22 +0000 (18:35 -0500)
commit830f36607c9aed5a44ef2f92ffc53980376813fa
tree9212f59582a7727ea9a7e8a052b3a839cf839778
parent7585f23ce30f68d16e722f6cd05c4ec250611664
parent1642dbe0e826fc5343c32cc589834cbf23794f4a
Merge branch 'bug_7678' into 3.12-master