From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 8 Feb 2015 10:56:33 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=760348134595e67b49d9be7284ae9c74c1d2d9b5;hp=760348134595e67b49d9be7284ae9c74c1d2d9b5;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en
---