From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 8 Apr 2015 17:59:11 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=43a857a965517d3fcdeae0300a01c1297f9d211c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

43a857a965517d3fcdeae0300a01c1297f9d211c