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

Merge branch 'master' into newmc
---

e2e98a979c3961258cada55bdf06c0865a0ff884