Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMichael <Michael@Michael-LT.bfh.ch>
Mon, 9 Nov 2015 10:53:55 +0000 (11:53 +0100)
committerMichael <Michael@Michael-LT.bfh.ch>
Mon, 9 Nov 2015 10:53:55 +0000 (11:53 +0100)
commita828f1c2af9a71b6058ccbc7cd9c0b59000718ee
tree1ef8bc056ef179fd2a40de8e5e917b6d8072491d
parent7865c937f02c5f7693aa8bf5cf64240993e7b82f
parentd3e52f2c7fc833c0c34d73f9988d47a3ead0b0db
Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development