From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 7 Feb 2015 09:13:56 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=4e2ae6f8f5cb92a1938eb1a9f5b692b230cacced;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

4e2ae6f8f5cb92a1938eb1a9f5b692b230cacced