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

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