From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Thu, 12 May 2016 19:42:12 +0000 (+0200)
Subject: Merge pull request #104 from mpeuster/master
X-Git-Tag: v3.1~125
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=2b7765f2750a8bedeb3d7cab62a7c6df2fd15d78;hp=c12f9766da652bfa4bed24f077c5666389c2bdbe;p=osm%2Fvim-emu.git

Merge pull request #104 from mpeuster/master

re-test to check jenkins config
---