Merge branch 'bug_8986' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:35:24 +0000 (13:35 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 18:35:24 +0000 (13:35 -0500)
commit986a18c82b8cb2af27f96081a1e9ada39999ea58
treeeccfcd381ec8a723d4f23aff3b962675aeb154a3
parent83da56662d9482148ef08ba7ae8acdf93555a692
parent2b5000c7d47b59fdc1d228ff13e80ee52013dfa4
Merge branch 'bug_8986' into 3.12-master