From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 20 Feb 2015 12:08:30 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=c99c1530347a64a134c74659f10b9c1cd632b42f;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

c99c1530347a64a134c74659f10b9c1cd632b42f