Merge pull request #538 from commodo/python-update-6
authorsbyx <steven@midlink.org>
Thu, 13 Nov 2014 07:21:59 +0000 (08:21 +0100)
committersbyx <steven@midlink.org>
Thu, 13 Nov 2014 07:21:59 +0000 (08:21 +0100)
Python update 6


Trivial merge