Merge branch 'master' of ctpug.org.za:koperkapel
authorSimon Cross <hodgestar@gmail.com>
Sat, 5 Mar 2016 20:02:11 +0000 (22:02 +0200)
committerSimon Cross <hodgestar@gmail.com>
Sat, 5 Mar 2016 20:02:11 +0000 (22:02 +0200)

Trivial merge