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

Merge branch 'master' into newmc
---

250e34c727eb5a803abfb68f7b21ba3724211e68