From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 7 Feb 2015 13:58:45 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=bb4163112cc0f65489594601f7743a6165892b97;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

bb4163112cc0f65489594601f7743a6165892b97