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

Conflicts:
	www/webapp/backend/mirrors.py

diff --cc www/webapp/backend/mirrors.py
index 2d97b7924f75bf4a6e4d20629be9d1a51086f34e,efd0cd6481b8e2bb154aed5cd693711643e2916c..87c237dd050eab872c225cec557bea153f591b09
--- 1/www/webapp/backend/mirrors.py
--- 2/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():

diff --cc www/webapp/ui_modules.py
Simple merge