From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 28 Feb 2015 18:18:51 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=228bfd242a3d9317246b99b55bbc89ce43d2caa2;hp=--cc;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

228bfd242a3d9317246b99b55bbc89ce43d2caa2