Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorDominik <muggd1@bfh.ch>
Tue, 3 Nov 2015 10:21:08 +0000 (11:21 +0100)
committerDominik <muggd1@bfh.ch>
Tue, 3 Nov 2015 10:21:08 +0000 (11:21 +0100)

Trivial merge