From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Jan 2011 18:27:06 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c93793dd03b602f153c3ff51debb028af18bf825;p=ipfire.org.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org

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

c93793dd03b602f153c3ff51debb028af18bf825