From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Jan 2011 14:00:11 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b0a24ab16f38920204391443da5ea8003f7b06e;p=ipfire.org.git

Merge branch 'next'

Conflicts:
	www/banners.json
	www/mirrors.json
	www/news.json
	www/releases.json
	www/templates/base.html
	www/templates/index.html
	www/templates/static/artwork.html
	www/templates/static/development.html
	www/templates/static/screenshots.html
	www/webapp/backend/tracker.py
	www/webapp/handlers.py
---

4b0a24ab16f38920204391443da5ea8003f7b06e