Merge branch 'development' of git@git.bfh.ch:staff/due1/sed-hs15-srs-purple.git into...
authorEric Dubuis <eric.dubuis@bfh.ch>
Tue, 20 Oct 2015 11:46:36 +0000 (13:46 +0200)
committerEric Dubuis <eric.dubuis@bfh.ch>
Tue, 20 Oct 2015 11:46:36 +0000 (13:46 +0200)

Trivial merge