Merge branch 'master' of git.bfh.ch:staff/due1/sed-hs15-srs-green master
authorEric Dubuis <eric.dubuis@bfh.ch>
Tue, 6 Oct 2015 10:30:33 +0000 (12:30 +0200)
committerEric Dubuis <eric.dubuis@bfh.ch>
Tue, 6 Oct 2015 10:30:33 +0000 (12:30 +0200)

Trivial merge