Merge remote branch 't0m/swann' into swann
authorDan Brook <broq@cpan.org>
Thu, 6 May 2010 16:34:07 +0000 (17:34 +0100)
committerDan Brook <broq@cpan.org>
Thu, 6 May 2010 16:34:07 +0000 (17:34 +0100)
commitb934c7c4718329780c48ef725d400789aff633cd
tree3bb15b39f5987e889dd3384b0daa76fba013ed74
parent789afda05bd439a52c01baed9254be11320d22da
parent413b0bb15ef45e679bf68198d7055dcba2a01819
Merge remote branch 't0m/swann' into swann

Conflicts:
Changes
script/bootstrap.pl
script/env
Changes
Makefile.PL
script/bootstrap.pl