From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 17 Feb 2008 21:22:49 +0000 (+0100)
Subject: Merge commit 'origin/master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=acce36b93fc8530fb50f50ca9edd08e6f6409b04;p=deb%2Fpackages.git

Merge commit 'origin/master' into ubuntu-master

Conflicts:

	static/index.tmpl
---

acce36b93fc8530fb50f50ca9edd08e6f6409b04