From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 2 Mar 2015 16:58:18 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=184ac15755819f6ca1c4a54182c1456521cddb24;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

184ac15755819f6ca1c4a54182c1456521cddb24