Merge branch 'bug_9688' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:18:20 +0000 (10:18 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:18:20 +0000 (10:18 -0500)
commitb631b164700c3ee10308d83570c1eef2973fa335
tree937111882c59b3ec23fbd2a34ade64f3323a8c83
parente84c0b679804f05d775254ddd702cf5b72fbf1e5
parentfe5115e2ae88cd79cac581bb3551f53ca1ed07e7
Merge branch 'bug_9688' into 3.12-master