Merge remote-tracking branch 'origin/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 3 May 2017 10:54:23 +0000 (12:54 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 3 May 2017 10:54:23 +0000 (12:54 +0200)
commit3022636ba875aaf57b9404d0299f753e4b7b6f80
tree90f5b65f302834e3e02d2677c1dfd0f0c25942ce
parent29afff5798b26242e1bfe1d92ef0ef0d9ddc4a97
parenta58772a51328578fea11f2d5f388b639abf9e810
Merge remote-tracking branch 'origin/master'

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