Merge branch 'master' into master

modules/ducks.py

@@ -220,6 +220,7 @@ class Module(object):
         self.bot.add_timer("duck-decoy", next_decoy_time, persist=False,
             server=event["server"], channel=event["target"])
 
+
     def duck_stats(self, event):
         user = event["user"]
         channel = event["target"].name
@@ -258,3 +259,6 @@ class Module(object):
                 total_friends) + " ducks befriended (" + str(channel_friends)
             + " in " + channel + ")")
 
+
+        
+