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

Merge branch 'master' into newmc
---

f40a7dec896bd2f5a2d09d155ac20090ca0bcbef