Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Mon, 10 Apr 2017 09:51:20 +0000 (11:51 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Mon, 10 Apr 2017 09:51:20 +0000 (11:51 +0200)
commitc911ca6a6560d062fed5d294bc5a80c26da69672
treed4bcf95be3cf608e84119a94af1762361652b60a
parent5b876700bdef500e17c212f5b0bcea5383e44528
parenta98b1e8dd7630fc358cd65f3fa133886365b283a
Merge remote-tracking branch 'upstream/master'

Conflicts:
src/emuvim/api/sonata/dummygatekeeper.py
src/emuvim/api/sonata/dummygatekeeper.py
src/emuvim/dashboard/__init__.py