From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 25 Mar 2014 12:38:32 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=commitdiff_plain;h=e63eaf407e505337cd02d7bc7ca3010ab6337348

Merge branch 'master' into mindcoding

Conflicts:
	lib/Gruntmaster/Page/Generic.pm
	lib/Gruntmaster/Page/Pb/Entry.pm
	tmpl/ct_entry.en
---

e63eaf407e505337cd02d7bc7ca3010ab6337348