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

Merge branch 'master' into newmc
---

3e9c060abdcab012619d36d2532ea2028f47f685