From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 23 Feb 2015 14:39:04 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=898dded38238e89ca0932d23a6a4d3b3759c9cbf;hp=898dded38238e89ca0932d23a6a4d3b3759c9cbf;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en
---