From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 2 Jul 2014 10:11:13 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=88749c11bc5ce5cf9f83fb1f0d972b501b64522b;p=bsc-thesis1415.git

Merge branch 'master' into develop
---

88749c11bc5ce5cf9f83fb1f0d972b501b64522b