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

Merge branch 'master' into newmc

Conflicts:
	tmpl/pb_entry.en
---