Merge branch 'master' into quoteModule

Conflicts: hsbot.cabal
2011-09-10 00:10:00 +02:00 · 2011-09-10 00:10:00 +02:00 · 900c242551
commit 900c242551
parent 6f126049a3 f1ce0cfee0
11 changed files with 203 additions and 169 deletions
--- a/hsbot.cabal
+++ b/hsbot.cabal
@ -23,6 +23,7 @@ Library
                    Hsbot.Core
                    Hsbot.Message
                    Hsbot.Plugin
+                    Hsbot.Plugin.Admin
                    Hsbot.Plugin.Duck
                    Hsbot.Plugin.Ping
                    Hsbot.Plugin.Quote
@ -43,9 +44,10 @@ Library
                    network,
                    random,
                    safecopy,
-                    tls >= 0.6.1,
+                    tls >= 0.7.1,
                    tls-extra >= 0.2.0,
                    time,
+                    utf8-string,
                    xdg-basedir