James Lu f06bcc7928 Merge commit 'bd755e137ffa034007a77d75fbd00d21e759163e' into wip/logger-module ...

Conflicts:
	proto.py

2015-07-05 13:22:17 -07:00

..

admin.py

plugins/admin.py: add 'showuser' command

2015-06-19 13:00:23 -07:00

commands.py

Merge commit 'bd755e137ffa034007a77d75fbd00d21e759163e' into wip/logger-module

2015-07-05 13:22:17 -07:00

hooks.py

Refactor hooks to send parsed arguments instead of raw args

2015-07-04 19:00:29 -07:00