Merge branch 'master' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git
authorDominik <muggd1@bfh.ch>
Wed, 14 Oct 2015 10:49:42 +0000 (12:49 +0200)
committerDominik <muggd1@bfh.ch>
Wed, 14 Oct 2015 10:49:42 +0000 (12:49 +0200)

Trivial merge