Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMichael <Michael@Michael-LT.bfh.ch>
Mon, 23 Nov 2015 10:33:26 +0000 (11:33 +0100)
committerMichael <Michael@Michael-LT.bfh.ch>
Mon, 23 Nov 2015 10:33:26 +0000 (11:33 +0100)
commitd8395c20efedd96a1c7e30f40e67963453d2257e
tree2d1d16e0d155ad5f5b388b85c7587338cfc25e70
parenta08b04378c3807dc8e4438424cae97f8cf0e896d
parent5ff98db05d152725bb65045c26b82cd3386121cd
Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development