Merge branch 'development' of git@git.bfh.ch:staff/due1/sed-hs15-srs-purple.git into...
authorMoritz Trittibach <tritm3@bfh.ch>
Mon, 9 Nov 2015 10:45:15 +0000 (11:45 +0100)
committerMoritz Trittibach <tritm3@bfh.ch>
Mon, 9 Nov 2015 10:45:15 +0000 (11:45 +0100)

Trivial merge