From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Jan 2010 11:43:05 +0000 (+0100)
Subject: Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire.org into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7ad0f17033e9288cbbaf0b7cc8757755a41e511;p=ipfire.org.git

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

Conflicts:

	www/webapp/helpers.py
---

b7ad0f17033e9288cbbaf0b7cc8757755a41e511
diff --cc www/webapp/helpers.py
index 21ed2b9a,50ecdd02..3e1df309
--- a/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
-