Merge branch 'master' of https://github.com/stevenvanrossem/son-emu
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 19 Feb 2016 09:34:28 +0000 (10:34 +0100)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 19 Feb 2016 09:34:28 +0000 (10:34 +0100)

Trivial merge