Merge branch 'master' of ctpug.org.za:koperkapel
authorSimon Cross <hodgestar@gmail.com>
Wed, 2 Mar 2016 20:24:28 +0000 (22:24 +0200)
committerSimon Cross <hodgestar@gmail.com>
Wed, 2 Mar 2016 20:24:28 +0000 (22:24 +0200)

Trivial merge