Merge branch 'bug_7358' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:20:32 +0000 (18:20 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:20:32 +0000 (18:20 -0500)
commiteb27e4084d21f18e4ed8abeacdfc0538c58760d6
treeb4e943461a1a419d9665ad14746e784bfa9ebee0
parentde84bd9e46ae1ba0f42deec077f4e45c368676bf
parentd57194e24dc99ac62ef15327b5af6a3c4e0fae87
Merge branch 'bug_7358' into 3.12-master