From: Jeremy Thurgood <firxen@gmail.com>
Date: Thu, 15 May 2014 17:11:33 +0000 (+0200)
Subject: Merge branch 'master' into No_movement_mode
X-Git-Tag: 0.1~284
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=0cef06f581d48315a59a19ac06ca1d2be14cbb4c;p=naja.git

Merge branch 'master' into No_movement_mode
---

0cef06f581d48315a59a19ac06ca1d2be14cbb4c