From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 7 Dec 2015 16:09:16 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=986c4a18f00206db5efdba6316a4c9cd48c34358;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

986c4a18f00206db5efdba6316a4c9cd48c34358