Merge branch 'master' of ctpug.org.za:koperkapel
authorSimon Cross <hodgestar@gmail.com>
Sat, 5 Mar 2016 23:26:00 +0000 (01:26 +0200)
committerSimon Cross <hodgestar@gmail.com>
Sat, 5 Mar 2016 23:26:00 +0000 (01:26 +0200)

Trivial merge