Merge branch 'bug_7387' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:59:16 +0000 (10:59 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 15:59:16 +0000 (10:59 -0500)
commit9aba512ceec2b584f0df6df90fe5ef32b587c4a6
treec6515c54713f765d9db5f400bbf893d7ac727b98
parenta22060a46eb95901b9e0016f58838147ac068be3
parentf9712ee228bd1401f2367c1933542a1257c131bb
Merge branch 'bug_7387' into 3.12-master