From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 20 Apr 2015 21:56:53 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=4bf1c3e5f36dcf283517de28b92c4ae7ed10edf0;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

4bf1c3e5f36dcf283517de28b92c4ae7ed10edf0