From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 8 Mar 2015 10:17:15 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=e892a76a1aed693d33fba7f0015f42824ecf4dbb;hp=e892a76a1aed693d33fba7f0015f42824ecf4dbb;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	Makefile.PL
	make_static.PL
---