From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 11 Apr 2015 12:07:58 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=3dbe882702b33302251aee9cc2d1d54b631ab861;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

3dbe882702b33302251aee9cc2d1d54b631ab861