chiark / gitweb /
Merge remote branch 'pkern/master'
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 4 Sep 2010 13:56:36 +0000 (15:56 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 4 Sep 2010 13:56:36 +0000 (15:56 +0200)
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

Trivial merge