]> git.ipfire.org Git - people/shoehn/ipfire.org.git/commitdiff
Merge branch 'next'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 Jan 2011 14:00:11 +0000 (15:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 14 Jan 2011 14:00:11 +0000 (15:00 +0100)
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

1  2 
www/templates/static/donation.html
www/templates/static/features.html
www/templates/static/imprint.html

Simple merge
Simple merge
Simple merge