From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 20 Apr 2015 07:36:04 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=d19b7b577a3b51ad59f88cf0057bf9ff49343d7e;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

d19b7b577a3b51ad59f88cf0057bf9ff49343d7e