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

Merge branch 'master' into newmc

Conflicts:
	js/90-themes.js
	tmpl/skel.en
---