Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMichael <Michael@Michael-LT.bfh.ch>
Mon, 9 Nov 2015 10:53:55 +0000 (11:53 +0100)
committerMichael <Michael@Michael-LT.bfh.ch>
Mon, 9 Nov 2015 10:53:55 +0000 (11:53 +0100)

Trivial merge