From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 31 Jan 2009 19:29:32 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=9786e970292c154845a5f5dbc3086191ea59a6f0

Merge branch 'master' into ubuntu-master

Conflicts:
	templates/config/mirrors.tmpl
---

9786e970292c154845a5f5dbc3086191ea59a6f0