From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 6 Feb 2015 12:09:01 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=29de778ba60e4c2b499b417e0dfa4317d54c5d57;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

29de778ba60e4c2b499b417e0dfa4317d54c5d57