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

Merge branch 'master' into newmc
---

0d12c5c7ec3492867894f88979c51264374c0593