Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMichael <Michael@Michael-LT.bfh.ch>
Wed, 21 Oct 2015 08:56:16 +0000 (10:56 +0200)
committerMichael <Michael@Michael-LT.bfh.ch>
Wed, 21 Oct 2015 08:56:16 +0000 (10:56 +0200)
commit43ebfd306ff8fed4bb637a7e7d11c16a7f853314
tree456cf3831589402458e445f14015b425e36d118a
parent7f912ebe5478d3175aa7cad57ba31d7dc7252103
parentaad061d729c335d40973b813707a8b0451955b22
Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development