From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 9 Feb 2015 21:02:43 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=sidebyside;h=3e09c768b3e7c39806494d2cc6e24b845ff108f3;hp=3e09c768b3e7c39806494d2cc6e24b845ff108f3;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en
---