From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 4 Feb 2015 12:52:28 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=02a539e5023724166530a97c64b7eb8bea6ace16;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

02a539e5023724166530a97c64b7eb8bea6ace16