Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMichael <Michael@Michael-LT.bfh.ch>
Wed, 9 Dec 2015 12:44:07 +0000 (13:44 +0100)
committerMichael <Michael@Michael-LT.bfh.ch>
Wed, 9 Dec 2015 12:44:07 +0000 (13:44 +0100)

Trivial merge