Merge branch 'master' of ctpug.org.za:koperkapel
authorSimon Cross <hodgestar@gmail.com>
Fri, 4 Mar 2016 21:39:47 +0000 (23:39 +0200)
committerSimon Cross <hodgestar@gmail.com>
Fri, 4 Mar 2016 21:39:47 +0000 (23:39 +0200)

Trivial merge