From: Niklas Hofmann <niklas.hofmann@everbase.net>
Date: Sat, 9 Aug 2014 14:35:26 +0000 (+0200)
Subject: Merge branch 'everbase' into roles
X-Git-Url: http://git.meshlink.io/?p=meshlink;a=commitdiff_plain;h=87b60ec7e32d14ce0ebe20bb19a342d9e0aac70a

Merge branch 'everbase' into roles
---

87b60ec7e32d14ce0ebe20bb19a342d9e0aac70a