Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMichael <Michael@Michael-LT.bfh.ch>
Tue, 8 Dec 2015 11:10:08 +0000 (12:10 +0100)
committerMichael <Michael@Michael-LT.bfh.ch>
Tue, 8 Dec 2015 11:10:08 +0000 (12:10 +0100)
commit9812dec216803b8e34538e4264a9fe94e9bb0356
tree0f4d5ec2e29dfff36a944e08829d974f158ac546
parentd040b026aa6774def9a0d79c0159acd11a846c63
parentc46f358deb8f7a383c1cad1cd3885b905e38d101
Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development