Merge branch 'master' of ctpug.org.za:koperkapel
authorDavid Sharpe <decoydavid@gmail.com>
Thu, 3 Mar 2016 22:31:58 +0000 (00:31 +0200)
committerDavid Sharpe <decoydavid@gmail.com>
Thu, 3 Mar 2016 22:31:58 +0000 (00:31 +0200)

Trivial merge