From: Mart Lubbers <mart@martlubbers.net>
Date: Sun, 8 Mar 2015 08:15:36 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/bachelor
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=bde64af81f7a3aa74d6dc56f7138d248a1985181;p=bsc-thesis1415.git

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

bde64af81f7a3aa74d6dc56f7138d248a1985181