Merge branch 'bug_7018' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:05:07 +0000 (08:05 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:05:07 +0000 (08:05 -0400)
commit7db1cc4235a2b7e7321a80d98929e4900c0437a8
treeb6e5b41b8206efbd337397f725b791cb08641d3e
parent5ca45b846acdc84ba9cb4ea4583fcaa4012d5edf
parenta06fd2225b37be8a8d2349c5929bc4877b47b547
Merge branch 'bug_7018' into 3.12-master