Merge remote-tracking branch 'progval/testing' into testing

plugins/Time/plugin.py

@@ -175,6 +175,7 @@ class Time(callbacks.Plugin):
             timezone = pytz.timezone(timezone)
         except pytz.UnknownTimeZoneError:
             irc.error(_('Unknown timezone'))
+            return
         irc.reply(str(datetime.now(timezone)))
     tztime = wrap(tztime, ['text'])
 

src/version.py

@@ -1,3 +1,3 @@
 """stick the various versioning attributes in here, so we only have to change
 them once."""
-version = '0.83.4.1+limnoria (2011-08-16T13:22:23+0200)'
+version = '0.83.4.1+limnoria (2011-08-18T11:07:25+0200)'