From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Jul 2012 09:30:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bda7014352a0cde56a64765ea9daa63c6aee889;p=ipfire.org.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

Conflicts:
	www/webapp/backend/mirrors.py
---

4bda7014352a0cde56a64765ea9daa63c6aee889
diff --cc www/webapp/backend/mirrors.py
index 2d97b792,efd0cd64..87c237dd
--- a/www/webapp/backend/mirrors.py
+++ b/www/webapp/backend/mirrors.py
@@@ -25,7 -97,7 +97,7 @@@ class Mirrors(object)
  		return Memcached()
  
  	def list(self):
- 		return [Mirror(m.id) for m in self.db.query("SELECT id FROM mirrors WHERE disabled = 'N' ORDER BY state")]
 -		return [Mirror(m.id) for m in self.db.query("SELECT id FROM mirrors ORDER BY state,hostname")]
++		return [Mirror(m.id) for m in self.db.query("SELECT id FROM mirrors WHERE disabled = 'N' ORDER BY state,hostname")]
  
  	def check_all(self):
  		for mirror in self.list():