Merge branch 'master' of git+ssh://ctpug.org.za/naja
authorSimon Cross <hodgestar@gmail.com>
Sun, 11 May 2014 15:57:37 +0000 (17:57 +0200)
committerSimon Cross <hodgestar@gmail.com>
Sun, 11 May 2014 15:57:37 +0000 (17:57 +0200)

Trivial merge