From: Anders <mortberg@chalmers.se>
Date: Thu, 18 Jun 2015 14:44:49 +0000 (+0200)
Subject: Merge branch 'no_regular' into equiv
X-Git-Url: https://git.ak3n.com/?a=commitdiff_plain;h=9125aca569f121bfc73d83012ed1ec6c79367fda;p=cubicaltt.git

Merge branch 'no_regular' into equiv

# Conflicts:
#	CTT.hs
#	Eval.hs
---

9125aca569f121bfc73d83012ed1ec6c79367fda