From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 1 Aug 2010 10:47:18 +0000 (+0200)
Subject: Merge branch 'master' into tracker
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82e486eec5d329d84ca398e831b38c278f6e2f85;p=ipfire.org.git

Merge branch 'master' into tracker
---

82e486eec5d329d84ca398e831b38c278f6e2f85
diff --cc www/webapp/handlers.py
index 53d47ede,95de62c6..636e0a8b
--- a/www/webapp/handlers.py
+++ b/www/webapp/handlers.py
@@@ -21,12 -21,9 +21,10 @@@ from info import inf
  from mirrors import mirrors
  from news import news
  from releases import releases
 +from torrent import tracker, bencode, bdecode, decode_hex
  
  import builds
- import cluster
  import menu
- import translations
  #import uriel
  
  class BaseHandler(tornado.web.RequestHandler):