Merge branch 'bug_7938' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:53:45 +0000 (21:53 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:53:45 +0000 (21:53 -0400)
commit582126c31a48fdf3dcdad3de59598dfad9cd2d44
treee74e35fb40f2a9f9d43b291f0eb10987b296f1a4
parentde3060e2858741ccae250ceee8b431004b81eae8
parentcc62d0c4dd3358e7b91d4793f704b1c6a66ba0db
Merge branch 'bug_7938' into 3.12-master