Merge branch 'bug_7731' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 29 Nov 2012 00:10:45 +0000 (19:10 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 29 Nov 2012 00:10:45 +0000 (19:10 -0500)
commitf8c6966940bffd9932d326bcd71c2dd011d3b2f9
tree9b37aff468d626e57260d21b50019ac513544b26
parentb1fc803122da181311443d1a3c4193bc10cd22fc
parent900e1d30b2978eebcce53800ac4df5e1adf5f67e
Merge branch 'bug_7731' into 3.12-master