]> git.ipfire.org Git - people/shoehn/ipfire.org.git/commit - www/webapp/__init__.py
Merge commit 'origin/next' into next
authorJan Paul Tuecking <earl@ipfire.org>
Tue, 19 Jan 2010 21:50:41 +0000 (22:50 +0100)
committerJan Paul Tuecking <earl@ipfire.org>
Tue, 19 Jan 2010 21:50:41 +0000 (22:50 +0100)
commit947891fdceaeb7867eae5d4c4744aeab8409b96d
treefd88979d840c5d9e8a14843608d5e10ee56fc69a
parentd4dc517c1cae4983bacb312c5ca17c733bfef403
parent5a1018ab75cac53f9b00e8bcb5ad33ebda898ba0
Merge commit 'origin/next' into next
www/webapp/__init__.py