From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 25 Mar 2015 14:53:39 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=838663d1450cf5606e59c30966e2e56b0f787416;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

838663d1450cf5606e59c30966e2e56b0f787416