Merge branch 'development' of git@git.bfh.ch:staff/due1/sed-hs15-srs-purple.git into...
authorMoritz Trittibach <tritm3@bfh.ch>
Mon, 9 Nov 2015 10:45:15 +0000 (11:45 +0100)
committerMoritz Trittibach <tritm3@bfh.ch>
Mon, 9 Nov 2015 10:45:15 +0000 (11:45 +0100)
commitccd6bf7bae65b419ebaf09334a5287bba61237e2
treecbf5c71768ef77149d99d7a182769bbf46c985f6
parent9a78ca130e2edecc404251e0419d1e604a7b4694
parentcf34bcef58a3cb2070d0579656ec9558cbfb1481
Merge branch 'development' of git@git.bfh.ch:staff/due1/sed-hs15-srs-purple.git into development