Merge branch 'bug_8061' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 16:52:23 +0000 (12:52 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 16:52:23 +0000 (12:52 -0400)
commitc4904214079462397317f714fe89c581daa981ce
treed2985641c5876e9e3cef45a1d8c0ffbaa8a4abb8
parent815a6b62bd4ce34ea791ca795a62227c462d53ed
parent7f48829c50c437b5917e8318b505f0cf86a751a9
Merge branch 'bug_8061' into 3.12-master