From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Mon, 21 Mar 2016 14:57:40 +0000 (+0100)
Subject: Merge branch 'dev-sonata-dummy-gatekeeper'
X-Git-Tag: v3.1~159^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=644b319afbe785ecf05cad40dcbc118d57204c2d;p=osm%2Fvim-emu.git

Merge branch 'dev-sonata-dummy-gatekeeper'
---

644b319afbe785ecf05cad40dcbc118d57204c2d