Merge branch 'bug_9660' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:49:23 +0000 (21:49 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 01:49:23 +0000 (21:49 -0400)
commitde3060e2858741ccae250ceee8b431004b81eae8
tree852649658862aa208b55e53e6b5f833d456d8c4d
parenta19d663438427651b9918ad10af8d726836045e7
parent082b6e1e6999c6572b8eb09922377a7129f7351b
Merge branch 'bug_9660' into 3.12-master