Merge branch 'master' into develop2

This commit is contained in:
james.bertino 2014-05-06 17:02:27 -04:00
commit a6b908d07c

2
bot.py
View File

@ -92,7 +92,7 @@ def greeter_string(conjunction):
def welcome(newcomer): def welcome(newcomer):
ircsock.send("PRIVMSG {0} :Welcome {1}! The channel is pretty quiet " ircsock.send("PRIVMSG {0} :Welcome {1}! The channel is pretty quiet "
"right now, so I though I'd say hello, and ping some people " "right now, so I though I'd say hello, and ping some people "
",like {2}, that you're here. If no one responds for a " "(like {2}) that you're here. If no one responds for a "
"while, try emailing us at hello@openhatch.org or just try " "while, try emailing us at hello@openhatch.org or just try "
"coming back later. FYI, you're now on my list of known " "coming back later. FYI, you're now on my list of known "
"nicknames, so I won't bother you again." "nicknames, so I won't bother you again."