From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 6 Feb 2015 15:21:28 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=5251db546cbc5eb678a007cfee54d170ad29ff45;hp=5251db546cbc5eb678a007cfee54d170ad29ff45;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en
---