From: Simon Huber <hubsim@gmail.com>
Date: Fri, 5 Jun 2015 13:56:59 +0000 (+0200)
Subject: Merge branch 'hisoproj' into no_regular
X-Git-Url: https://git.ak3n.com/?a=commitdiff_plain;h=2b39f0db456574e91fa69211c2e8803092ed8822;p=cubicaltt.git

Merge branch 'hisoproj' into no_regular

Conflicts:
	Eval.hs
---

2b39f0db456574e91fa69211c2e8803092ed8822