Merge branch 'master' of ctpug.org.za:koperkapel
authorSimon Cross <hodgestar@gmail.com>
Thu, 3 Mar 2016 22:37:26 +0000 (00:37 +0200)
committerSimon Cross <hodgestar@gmail.com>
Thu, 3 Mar 2016 22:37:26 +0000 (00:37 +0200)

Trivial merge