From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 26 May 2014 21:00:13 +0000 (+0200)
Subject: Merge branch 'develop' of github.com:dopefishh/bachelor into version-0.02
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=8746f075b7441f14b0eb8a0867b7bd4f23234518;p=bsc-thesis1415.git

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

8746f075b7441f14b0eb8a0867b7bd4f23234518