Merge branch 'master' of ctpug.org.za:koperkapel
authorSimon Cross <hodgestar@gmail.com>
Sun, 28 Feb 2016 15:50:35 +0000 (17:50 +0200)
committerSimon Cross <hodgestar@gmail.com>
Sun, 28 Feb 2016 15:50:35 +0000 (17:50 +0200)

Trivial merge