Merge remote-tracking branch 'kali/bug/pep8-cleanup' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Mon, 9 Dec 2013 21:23:00 +0000 (18:23 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Mon, 9 Dec 2013 21:23:00 +0000 (18:23 -0300)

Trivial merge