Merge branch 'master' of ctpug.org.za:koperkapel
authorSimon Cross <hodgestar@gmail.com>
Fri, 4 Mar 2016 22:43:19 +0000 (00:43 +0200)
committerSimon Cross <hodgestar@gmail.com>
Fri, 4 Mar 2016 22:43:19 +0000 (00:43 +0200)

Trivial merge