From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 21 Mar 2015 17:25:40 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=63d6fafab02d9aadb96c9d4bf43e7674cb77b489;p=gruntmaster-page.git

Merge branch 'master' into newmc
---

63d6fafab02d9aadb96c9d4bf43e7674cb77b489