Merge branch 'master' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git
authorDominik <muggd1@bfh.ch>
Wed, 14 Oct 2015 10:49:42 +0000 (12:49 +0200)
committerDominik <muggd1@bfh.ch>
Wed, 14 Oct 2015 10:49:42 +0000 (12:49 +0200)
commitc8c8b03df0a69ce752541fcdf7cd0267de0558b0
treead712cbd987388215ac78c0c258ff0773e626755
parent0fe9030f6ec43df1b55a9f630d98e51e74adf519
parentacd41bcf36acd3199931b38b2ad2855d0550047e
Merge branch 'master' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git