From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 25 Feb 2015 18:04:07 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=750b40cb7cf4c9dbf2b85c18e3d0db172441facd;hp=750b40cb7cf4c9dbf2b85c18e3d0db172441facd;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	lib/Plack/App/Gruntmaster.pm
---