From: Kalle Söderman <kalle.soderman@gmail.com>
Date: Sat, 5 Feb 2011 17:45:19 +0000 (+0000)
Subject: Merge branch 'debian-master' of ssh://git.deb.at/deb/packages into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=b237edbc970a5a6592e371f9c27d66bd590b06aa;p=deb%2Fpackages.git

Merge branch 'debian-master' of ssh://git.deb.at/deb/packages into debian-master
---

b237edbc970a5a6592e371f9c27d66bd590b06aa