From: Mart Lubbers <mart@martlubbers.net>
Date: Tue, 28 Oct 2014 08:16:56 +0000 (+0100)
Subject: Merge branch 'develop' of github.com:dopefishh/bachelor into develop
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=faf75e4c02a9dfe921d7e90c2c025ce28cd867b0;p=bsc-thesis1415.git

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

faf75e4c02a9dfe921d7e90c2c025ce28cd867b0