From: Marius Gavrilescu Date: Sun, 22 Mar 2015 21:27:29 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=5e6681ac51e0b6a50f7cc5d0ed51e5e5c6ff59f5;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: tmpl/pb_entry.en --- 5e6681ac51e0b6a50f7cc5d0ed51e5e5c6ff59f5 diff --cc tmpl/pb_entry.en index 1d595b2,5c5072c..e8d8f24 --- a/tmpl/pb_entry.en +++ b/tmpl/pb_entry.en @@@ -31,17 -31,18 +31,18 @@@ To submit solutions to this problem, pl