Merge branch 'master' of git.shadowcat.co.uk:Oyster
authorhakim <hakim@vm-participo.(none)>
Sat, 20 Nov 2010 19:13:08 +0000 (19:13 +0000)
committerhakim <hakim@vm-participo.(none)>
Sat, 20 Nov 2010 19:13:08 +0000 (19:13 +0000)
commita1486321037069b15f4ba521b88c06f3bd564461
tree74096a93b57547016283325253127002fcfbbd87
parent45bec3869f4bbacc7d522b8a683bbd52d837ff3d
parent189564ce3d11c6702de3f0ec72a30ad852186cd4
Merge branch 'master' of git.shadowcat.co.uk:Oyster

Conflicts:
lib/Dist/Zilla/App/Command/provision.pm
lib/Dist/Zilla/App/Command/provision.pm