Michel Oosterhof 9e3ef8ffd6 Merge branch 'master' into logging-2 ...

Conflicts:
	kippo/core/protocol.py
	kippo/core/ssh.py

2015-02-20 09:19:06 +00:00

..

__init__.py

move core/ and commands/ to kippo/

2009-11-22 07:07:58 +00:00

auth.py

Merge branch 'master' of https://github.com/micheloosterhof/kippo into logging-2

2015-02-19 12:36:26 +00:00

config.py

cosmetic changes to imports

2014-11-11 21:27:06 +04:00

dblog.py

wip

2015-02-19 14:10:37 +00:00

exceptions.py

restructuring and cleanup

2014-08-09 23:55:20 +03:00

fs.py

another relative import

2015-02-19 12:10:19 +00:00

honeypot.py

Merge branch 'master' of https://github.com/micheloosterhof/kippo into logging-2

2015-02-19 12:36:26 +00:00

interact.py

use relative style imports instead of absolute paths

2015-02-19 12:01:07 +00:00

protocol.py

Merge branch 'master' into logging-2

2015-02-20 09:19:06 +00:00

ssh.py

Merge branch 'master' into logging-2

2015-02-20 09:19:06 +00:00

sshserver.py

Fix kippo sandbox detecting, taken from

2015-01-21 08:48:32 +00:00

ttylog.py

remove unused imports

2014-12-07 17:56:38 +00:00

utils.py

use relative style imports instead of absolute paths

2015-02-19 12:01:07 +00:00