]> git.ipfire.org Git - ipfire.org.git/commit
Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire.org into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 21 Jan 2010 11:43:05 +0000 (12:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 21 Jan 2010 11:43:05 +0000 (12:43 +0100)
commitb7ad0f17033e9288cbbaf0b7cc8757755a41e511
tree2378a57f3d4b302e0e4b71d7ddb0b81f19b09bb6
parent8ccd2ff0d77a59aefafc229a245c78c38750848f
parent5a1018ab75cac53f9b00e8bcb5ad33ebda898ba0
Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire.org into next

Conflicts:

www/webapp/helpers.py
www/webapp/__init__.py
www/webapp/helpers.py