From: Greg Burri <greg.burri@gmail.com>
Date: Fri, 3 Nov 2017 20:22:26 +0000 (+0100)
Subject: Merge branch 'master' of gburri.org:master-thesis
X-Git-Tag: 1.0.13~17
X-Git-Url: http://git.euphorik.ch/?a=commitdiff_plain;h=42d4db26f30bccbcc2e1b6d1f82a5b04a1f3dcd2;p=master-thesis.git

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

42d4db26f30bccbcc2e1b6d1f82a5b04a1f3dcd2