From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 14 Mar 2008 23:47:42 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=c32e5806d3907b53fbd0d64cbb7c6bf7d87ae61d;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	templates/html/show.tmpl
---

c32e5806d3907b53fbd0d64cbb7c6bf7d87ae61d