Merge branch 'master' of ctpug.org.za:koperkapel
authorDavid.Sharpe <david.sharpe@Daves-MBP.lan>
Sat, 5 Mar 2016 16:11:23 +0000 (18:11 +0200)
committerDavid.Sharpe <david.sharpe@Daves-MBP.lan>
Sat, 5 Mar 2016 16:11:23 +0000 (18:11 +0200)

Trivial merge