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

Merge branch 'debian-master-kalle' into debian-master
---

22e0dac6ef4b5d38cd4c2c10bafe86e029fac43e