Merge branch 'master' of git+ssh://ctpug.org.za/koperkapel
authoradrianna <adrianna.pinska@gmail.com>
Sun, 28 Feb 2016 15:26:32 +0000 (17:26 +0200)
committeradrianna <adrianna.pinska@gmail.com>
Sun, 28 Feb 2016 15:26:32 +0000 (17:26 +0200)

Trivial merge