]> git.ipfire.org Git - people/shoehn/ipfire.org.git/commit
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)
commit4b0a24ab16f38920204391443da5ea8003f7b06e
tree704ed4f00182544d6ea84a07755255716f92052f
parentda8a8277bd87aeb663f856b83056f485afd88725
parentc4b8d02913a7c75a13c857378935cfee6a7191ce
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
www/templates/static/donation.html
www/templates/static/features.html
www/templates/static/imprint.html