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

Merge branch 'master' into newmc

Conflicts:
	log.conf
---

3a85cde38e7cd33e361f6b2f1b08f9419f09253c