Merge branch 'bug_9630' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 13:48:36 +0000 (08:48 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 18 Feb 2013 13:48:36 +0000 (08:48 -0500)
commit77572c15cee3513aefc1801d16242253339cb6fe
treedfcfafbf525e1198386c120d3e7f25bd9e2e7dc2
parentc8a8825367a3f2df9953a175ca2294cacbcddce7
parent5d14cef0cc08b87f28210aa2a4e33a206de4e054
Merge branch 'bug_9630' into 3.12-master