]> git.ipfire.org Git - ipfire.org.git/commit - www/webapp/ui_modules.py
Merge branch 'planet' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Aug 2010 11:40:13 +0000 (13:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 7 Aug 2010 11:40:13 +0000 (13:40 +0200)
commit01f86827dee47f50fcf3e383f1ee2fd741cb17cf
treefd9f3914071ae540ae3106a82df054ec54a4b49f
parent6a431ff2e182c8c47d32bfd2ee9af1c9f3c82ca0
parentd0d074e0766758bdd66fafdc4bb171ae8c9fd386
Merge branch 'planet' into next

Conflicts:
www/webapp/handlers.py
www/webapp/__init__.py
www/webapp/handlers.py