Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git...
authorMatthias <matthias.balmer@gmx.ch>
Wed, 18 Nov 2015 09:15:26 +0000 (10:15 +0100)
committerMatthias <matthias.balmer@gmx.ch>
Wed, 18 Nov 2015 09:15:26 +0000 (10:15 +0100)
commit61f66a13e3dbfa3a68679e6d9ff097b54a6af23c
tree685644f7eac5287f4835d469eee273bb84b49633
parentfdd96152994f883dd686b980004343bc13a08a6a
parenta49c468f620377150640a832f526d7109938c9ac
Merge branch 'development' of git@git.bfh.ch:/staff/due1/sed-hs15-srs-purple.git into development