From: Charlie Gerhardus <charlie.gerhardus@somedomain.something>
Date: Tue, 6 Oct 2015 22:25:22 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/dopefishh/tt2015
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;ds=sidebyside;h=3f4fb8c141d69ce9ee08175ce23ff792a9f4d11a;p=tt2015.git

Merge branch 'master' of https://github.com/dopefishh/tt2015
---

3f4fb8c141d69ce9ee08175ce23ff792a9f4d11a
diff --cc 3eval.tex
index 32b0fb9,19a1441..19a1441
mode 100755,100644..100755
--- a/3eval.tex
+++ b/3eval.tex