Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorDominik <muggd1@bfh.ch>
Tue, 3 Nov 2015 10:21:08 +0000 (11:21 +0100)
committerDominik <muggd1@bfh.ch>
Tue, 3 Nov 2015 10:21:08 +0000 (11:21 +0100)
commit84df96e674687d26c6c2caf61b1a3ef7916ade53
treecd69b4513dabb4997725d7c884923d264ef94953
parent20a46e613924aef70cd8cc4ae3535968e47da4a1
parent4f169fdcf558ff47e5dbf723a19b236f99bc815b
Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development