Merge branch 'master' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git
authorMichael <Michael@Michael-LT.bfh.ch>
Mon, 12 Oct 2015 08:58:27 +0000 (10:58 +0200)
committerMichael <Michael@Michael-LT.bfh.ch>
Mon, 12 Oct 2015 08:58:27 +0000 (10:58 +0200)
commitb59e6b245ca5bd33e43359f98d34f6bb527b4399
tree41cc2e5b0bbe07d1b31f196cb25ef2100a1995c8
parent5f6a69ff5676ab047b94e1718e7305495b6a2e29
parent041f8af56dbe73268de124c16b7ac4a79c69f816
Merge branch 'master' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git