From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 1 May 2014 06:47:02 +0000 (+0200)
Subject: Merge branch 'master' of github.com:dopefishh/bachelor
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=ca9e80af2bbb42c7a74c668ded10c2befff6ebd0;p=bsc-thesis1415.git

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

ca9e80af2bbb42c7a74c668ded10c2befff6ebd0