Merge branch 'bug_8664' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 17:12:59 +0000 (12:12 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 23 Nov 2012 17:12:59 +0000 (12:12 -0500)
commit48ce46e8fbcc2a249930bb8ee84b1aabc9667050
treea0f399dd415af98e841d6af4f9b63a8421199c9e
parent2512581533399bccbf785209918260f9b5031119
parent4fbadbaed42f6a5045246a13d228cbb678a9ab84
Merge branch 'bug_8664' into 3.12-master