From: Marius Gavrilescu <marius@ieval.ro>
Date: Sat, 21 Mar 2015 11:36:45 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=9694ccf33654e0cc01a2fa9390b76eb1a276d304;hp=9694ccf33654e0cc01a2fa9390b76eb1a276d304;p=plack-app-gruntmaster.git

Merge branch 'master' into newmc
---