Merge commit 'andersk/master' into live

diff --cc jirabot.py
index 55ff4bbb3e70c0b568c6797b639ec89b7569236f,2fee41dd45cbc2e9637005ff554d51ca8aeff4c5..9aa48f8735c83905801a9458248b10e0d9b3871e
--- 1/jirabot.py
--- 2/jirabot.py
+++ b/jirabot.py
@@@ -13,10 -14,23 +14,23 @@@ import tracebac
  import urlparse
  import zephyr
  
 -zephyr_sender = 'jira'
 -zephyr_class = 'andersk-test'
 +zephyr_sender = 'not-wdc'
 +zephyr_class = 'debathena'
  time_file = 'jirabot.time'
  
+ class UnicodeHTMLParser(htmllib.HTMLParser):
+     entitydefs = dict((k, unichr(v)) for (k, v) in htmlentitydefs.name2codepoint.items())
+ 
+     def convert_charref(self, name):
+         try:
+             n = int(name)
+         except ValueError:
+             return
+         return self.convert_codepoint(n)
+ 
+     def convert_codepoint(self, codepoint):
+         return unichr(codepoint)
+ 
  def jira_init():
      b = mechanize.Browser()
      b.set_handle_robots(False)