Merge branch 'bug_9697' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:23:04 +0000 (17:23 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:23:04 +0000 (17:23 -0400)
commitba6249cb72c0e692a8b7dd74833920388c9384a3
treef8002f6bc00094cde801d329bea0edc3817d7394
parent091e7fed858aed25614282ad544eac5556b9e468
parent732dbc8755725486d4f2f841214c4d2c581e7b75
Merge branch 'bug_9697' into 3.12-master