Merge branch 'master' into elkyrww

This commit is contained in:
Robert Wall 2013-06-23 23:51:15 -07:00
commit b7cb0d38ab

View File

@ -2634,10 +2634,7 @@ def get_help(cli, rnick, rest):
@cmd("help", raw_nick = True)
def help2(cli, nick, chan, rest):
"""Gets help"""
if rest.strip(): # command was given
get_help(cli, chan, rest)
else:
get_help(cli, nick, rest)
get_help(cli, nick, rest)
@hook("invite", raw_nick = False, admin_only = True)