merge

2013-07-22 15:42:36 +01:00
parent e78be1ccdc 9153c0ac66
commit b3edf5691c
4 changed files with 36 additions and 3 deletions
--- a/bot.properties
+++ b/bot.properties
@ -1,4 +1,4 @@
 server="irc.freenode.net"
 channel="linux"
-nick="irc-bash-bot"
+nick="bashbot"
 user="username hostname servername :realname"