Merge remote-tracking branch 'kali/feature/with_venvwrapper' into develop
authorIvan Alejandro <ivanalejandro0@gmail.com>
Mon, 9 Dec 2013 21:13:22 +0000 (18:13 -0300)
committerIvan Alejandro <ivanalejandro0@gmail.com>
Mon, 9 Dec 2013 21:13:22 +0000 (18:13 -0300)

Trivial merge