From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 20 Apr 2015 07:42:21 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=260a6894d9fdfe3cd2f05cd1926b77b46119dc01;hp=260a6894d9fdfe3cd2f05cd1926b77b46119dc01;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	css/custom.css
---