From: Marius Gavrilescu <marius@ieval.ro>
Date: Sun, 22 Mar 2015 17:18:08 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b8caa1675f0dc5c501fccb3716395709032519fb;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

b8caa1675f0dc5c501fccb3716395709032519fb