From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 18 Apr 2015 09:35:15 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=commitdiff_plain;h=1d4981aae22600f090d67d740017682354162ec8

Merge branch 'master' into newmc
---

1d4981aae22600f090d67d740017682354162ec8