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

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