Merge branch 'bug_7853' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 17:34:15 +0000 (13:34 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 7 Apr 2013 17:34:15 +0000 (13:34 -0400)
commitf063dad5f208fd02dc8a58835086f8b1714aa1ac
tree71ee10bfdf9c920aad3287779ba0d59dd85afa31
parent88eaa19bf0fd907e35adb606304e8cd042a42751
parent11caedbf1906dedd5a5c2692a2098d157f4fe380
Merge branch 'bug_7853' into 3.12-master