From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 4 Aug 2015 13:37:15 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=c51ab1a8ff2848793cc9e6df4a5811a75d982cac;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

c51ab1a8ff2848793cc9e6df4a5811a75d982cac