Merge branch 'bug_8682' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:10:32 +0000 (10:10 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 24 Feb 2013 15:10:32 +0000 (10:10 -0500)
commitc644598a04074bc5cadc7b50396533f17351ad12
treee579995317d1fa02c6b4cda5f87af747adac237d
parentda4df6adb67c768ad6506e55ebd96275067e42eb
parent63412f0ecd99136d65fe72ff384247d7eb7a7e22
Merge branch 'bug_8682' into 3.12-master