Merge branch 'master' of git.bfh.ch:staff/due1/sed-hs15-srs-green master
authorEric Dubuis <eric.dubuis@bfh.ch>
Tue, 6 Oct 2015 10:30:33 +0000 (12:30 +0200)
committerEric Dubuis <eric.dubuis@bfh.ch>
Tue, 6 Oct 2015 10:30:33 +0000 (12:30 +0200)
commit4db328d1594ce7775f7c02eec12aa4c0763c468c
treed03bbee7f0276801c76388a4e229039ea45aab5c
parent848f129de6ead292e8e4a98b270fd91303b56f17
parent4f4e54591c0b5d26259738fb09388fc6f75c2a66
Merge branch 'master' of git.bfh.ch:staff/due1/sed-hs15-srs-green