From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 19 Apr 2015 19:37:58 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=35fc050c68c786aea19320eafc99e923c523a8f3;hp=-c;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

35fc050c68c786aea19320eafc99e923c523a8f3