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

..

commands

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

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

core

Merge branch 'master' into logging-2

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

dblog

wip

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

__init__.py

move core/ and commands/ to kippo/

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