From: Camil Staps <info@camilstaps.nl>
Date: Thu, 26 Feb 2015 17:27:14 +0000 (+0100)
Subject: Merge branch 'camil-w3'
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=dd80bf5a411376247c614161d34fbb23cdb22413;p=fp1415.git

Merge branch 'camil-w3'
---

dd80bf5a411376247c614161d34fbb23cdb22413