Merge branch 'bug_7243' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 14:17:33 +0000 (09:17 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 14:17:33 +0000 (09:17 -0500)
commit1fd8ff155afed452acac530a99b267c31030a842
treefe91d9f08c99875c758c4a53f87b1a24088990f4
parentddca23762d8647e4e9937259001586fcf22ad721
parent95077493bd57d0a0a0f9e4dc08eeaa5a1828f26a
Merge branch 'bug_7243' into 3.12-master