From: Marius Gavrilescu 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;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: tmpl/pb_entry.en --- f52063ee557c4afcf17159a026da17681c9beda7 diff --cc tmpl/pb_entry.en index ebb947c,8246c42..208c3ce --- a/tmpl/pb_entry.en +++ b/tmpl/pb_entry.en @@@ -31,16 -31,17 +31,17 @@@ To submit solutions to this problem, pl