Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Massimo Santini 2011-07-14 14:28:27 +02:00
commit 86803b8ae4

View file

@ -152,7 +152,7 @@ def main():
else:
pelican.run()
except Exception, e:
log.critical(str(e))
log.critical(unicode(e))
if __name__ == '__main__':