Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire.org into next

Conflicts:

	www/webapp/helpers.py

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

diff --cc www/webapp/helpers.py
index 21ed2b9a6e708570a8def2892d816ed3c0eec04c,50ecdd02ae9c1dd4f5962c7c2491fa71bf39c049..3e1df30913bcfd8633486c535604713e19147120
--- 1/www/webapp/helpers.py
--- 2/www/webapp/helpers.py
+++ b/www/webapp/helpers.py
@@@ -21,12 -21,5 +21,11 @@@ def size(s)
        while s >= 1024 and idx < len(suffixes):
                s /= 1024
                idx += 1
--      
-       return "%.2f %s" % (s, suffixes[idx])
 +
+       return "%.0f%s" % (s, suffixes[idx])
++      
 +def _stringify(d):
 +      ret = {}
 +      for key in d.keys():
 +              ret[str(key)] = d[key]
 +      return ret
-