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

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