From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Wed, 3 May 2017 10:54:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v3.1~30^2~13
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=3022636ba875aaf57b9404d0299f753e4b7b6f80;hp=3022636ba875aaf57b9404d0299f753e4b7b6f80;p=osm%2Fvim-emu.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/emuvim/api/sonata/dummygatekeeper.py
---