From: Marius Gavrilescu <marius@ieval.ro>
Date: Mon, 9 Mar 2015 09:10:48 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=f52063ee557c4afcf17159a026da17681c9beda7;hp=f52063ee557c4afcf17159a026da17681c9beda7;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/pb_entry.en
---