Merge branch 'master' into go1

This commit is contained in:
Alex Bramley 2012-09-25 22:39:20 +01:00
commit c7809b90e4
1 changed files with 1 additions and 1 deletions

View File

@ -65,7 +65,7 @@ type Conn struct {
// that you can add event handlers to it. See AddHandler() for details. // that you can add event handlers to it. See AddHandler() for details.
func SimpleClient(nick string, args ...string) *Conn { func SimpleClient(nick string, args ...string) *Conn {
r := event.NewRegistry() r := event.NewRegistry()
l := logging.NewFromFlags() l := logging.DefaultLogger
ident := "goirc" ident := "goirc"
name := "Powered by GoIRC" name := "Powered by GoIRC"