Merge branch 'master' of git://ctpug.org.za/naja
authorDavid Sharpe <decoydavid@gmail.com>
Sat, 17 May 2014 20:17:42 +0000 (22:17 +0200)
committerDavid Sharpe <decoydavid@gmail.com>
Sat, 17 May 2014 20:17:42 +0000 (22:17 +0200)
1  2 
naja/actions.py

diff --cc naja/actions.py
Simple merge