Merge branch 'master' of github.com:stevenvanrossem/son-emu
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Tue, 17 May 2016 11:28:51 +0000 (13:28 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Tue, 17 May 2016 11:28:51 +0000 (13:28 +0200)

Trivial merge