From: Stefan Junker <steveeJ@users.noreply.github.com>
Date: Thu, 19 May 2016 13:45:07 +0000 (+0200)
Subject: Merge pull request #214 from steveeJ/merge-v0.2
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=398710b3c4338d78873d9402dffd8c317624696e;p=cni.git

Merge pull request #214 from steveeJ/merge-v0.2

Merge v0.2
---

398710b3c4338d78873d9402dffd8c317624696e