Merge remote-tracking branch 'upstream/master' into sockeye
authorDaniel Schwyn <schwyda@student.ethz.ch>
Tue, 13 Jun 2017 13:11:46 +0000 (15:11 +0200)
committerDaniel Schwyn <schwyda@student.ethz.ch>
Tue, 13 Jun 2017 13:11:52 +0000 (15:11 +0200)
Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>

1  2 
hake/RuleDefs.hs

Simple merge