From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 21 Apr 2008 18:06:31 +0000 (+0200)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=587dcc6f49188c0a2076e7316643f90a7c3d1d5a

Merge branch 'master' into ubuntu-master

Conflicts:

	templates/html/head.tmpl
---

587dcc6f49188c0a2076e7316643f90a7c3d1d5a