From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 24 Feb 2015 19:51:29 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b7c79e04cb3c8ea826ea1aac8049333564794536;hp=b7c79e04cb3c8ea826ea1aac8049333564794536;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	app.psgi
---