Merge branch 'sockeye-modules' into sockeye
authorDaniel Schwyn <schwyda@student.ethz.ch>
Mon, 24 Jul 2017 08:17:22 +0000 (10:17 +0200)
committerDaniel Schwyn <schwyda@student.ethz.ch>
Mon, 24 Jul 2017 08:17:37 +0000 (10:17 +0200)
Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>


Trivial merge