Merge branch 'master' into feature robbat/feature
authorRobin H. Johnson <robbat2@gentoo.org>
Sat, 12 Feb 2011 21:06:38 +0000 (21:06 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Sat, 12 Feb 2011 21:06:38 +0000 (21:06 +0000)
commitc463aa7bc469816c69d0a5fcb7e3d89f07a724f1
treeb7a47d52f1a4d9819a97446168cbc518319bdd15
parentd6b5ef316849780e0bf172295f1ac277c11b5490
parent052217de30c59206d7025b582d4604557a747470
Merge branch 'master' into feature
lib/rbot/ircbot.rb