From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 20 Apr 2015 14:27:46 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=a9159cae5cd97f3f2d52de2b7c64decd44534f77;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

a9159cae5cd97f3f2d52de2b7c64decd44534f77