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

This commit is contained in:
Mika Suomalainen 2011-08-18 14:39:32 +03:00
commit 679b8f21ea
2 changed files with 2 additions and 1 deletions

View File

@ -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'])

View File

@ -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)'