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)
commit10e4d4ec3a0ca5bd110764e214830a765284338e
tree35b2d7f2a8704d3144d336fe1834665935920bdf
parent71096db0da1288e086b6866760a6292418fbc211
parentcdb01a813def579fb06fb340903ecd8c9f866425
Merge remote-tracking branch 'upstream/master' into sockeye

Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>
hake/RuleDefs.hs