Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMichael <Michael@Michael-LT.bfh.ch>
Wed, 21 Oct 2015 08:56:16 +0000 (10:56 +0200)
committerMichael <Michael@Michael-LT.bfh.ch>
Wed, 21 Oct 2015 08:56:16 +0000 (10:56 +0200)

Trivial merge