From: Greg Burri <greg.burri@gmail.com>
Date: Sat, 4 Nov 2017 10:20:56 +0000 (+0100)
Subject: Merge branch 'master' of gburri.org:master-thesis
X-Git-Tag: 1.0.13~15
X-Git-Url: http://git.euphorik.ch/index.cgi?a=commitdiff_plain;h=c3f9ff71e0f80120b1f5b3e84e028b02b8cb1541;p=master-thesis.git

Merge branch 'master' of gburri.org:master-thesis
---

c3f9ff71e0f80120b1f5b3e84e028b02b8cb1541