Merge branch 'master' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git
authorMichael <Michael@Michael-LT.bfh.ch>
Mon, 12 Oct 2015 08:58:27 +0000 (10:58 +0200)
committerMichael <Michael@Michael-LT.bfh.ch>
Mon, 12 Oct 2015 08:58:27 +0000 (10:58 +0200)

Trivial merge