Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMatthias <matthias.balmer@gmx.ch>
Wed, 18 Nov 2015 09:15:26 +0000 (10:15 +0100)
committerMatthias <matthias.balmer@gmx.ch>
Wed, 18 Nov 2015 09:15:26 +0000 (10:15 +0100)

Trivial merge