From: Simon Cross <hodgestar@gmail.com>
Date: Sat, 5 Mar 2016 18:45:41 +0000 (+0200)
Subject: Merge branch 'master' of ctpug.org.za:koperkapel
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=359505e8ab4874f750103bcdc6222207bf52722a;hp=359505e8ab4874f750103bcdc6222207bf52722a;p=koperkapel.git

Merge branch 'master' of ctpug.org.za:koperkapel
---