Merge branch 'development' of
authorMichael <Michael@Michael-LT.bfh.ch>
Tue, 27 Oct 2015 14:25:15 +0000 (15:25 +0100)
committerMichael <Michael@Michael-LT.bfh.ch>
Tue, 27 Oct 2015 14:25:36 +0000 (15:25 +0100)
commit17c56df5b957569d1f358be1c33c6f734a2e2da7
treefcc19923a331e25ee50f9ea2f1fcdec68016dd66
parente4e2d9c0491782e8752bd8397647cddfdc8813b5
parent516fb9b8d5d0e68a842081043f6e880d3cff4205
Merge branch 'development' of
git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development