From: Marius Gavrilescu <marius@ieval.ro>
Date: Thu, 11 Feb 2016 16:29:35 +0000 (+0000)
Subject: Merge branch 'master' into scaleway
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=b64ba7e2b3b74ff6ee886e1ee3c85f7468758daf;hp=b64ba7e2b3b74ff6ee886e1ee3c85f7468758daf;p=gruntmaster-daemon.git

Merge branch 'master' into scaleway
---