From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 7 Feb 2014 09:38:43 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=22590ac20d06f8ee47dbf9a1e996c2519494d58e;hp=22590ac20d06f8ee47dbf9a1e996c2519494d58e;p=plack-app-gruntmaster.git

Merge branch 'master' into mindcoding

Conflicts:
	css/custom.css
---