Merge remote-tracking branch 'kali/bug/fix-imports' into develop
authorTomas Touceda <chiiph@leap.se>
Thu, 11 Apr 2013 12:20:52 +0000 (09:20 -0300)
committerTomas Touceda <chiiph@leap.se>
Thu, 11 Apr 2013 12:20:52 +0000 (09:20 -0300)
commit63f0d92a715b8d84536a449dc1e6b2b5eb9a7cb2
tree6a8e80ffcb11f2ab2a27d09f49033fe92dc731b7
parent1693669bacac1febcc81ad782028e216804d6f35
parent8b83009219f468b93acd7ec7a54cbd12fb3bc9fb
Merge remote-tracking branch 'kali/bug/fix-imports' into develop

Conflicts:
pkg/requirements.pip
setup.py
pkg/requirements.pip
setup.py