Imported Upstream version 1.2.4 upstream/1.2.4
authorLuk Claes <luk@debian.org>
Sat, 9 Jul 2011 10:20:38 +0000 (12:20 +0200)
committerLuk Claes <luk@debian.org>
Sat, 9 Jul 2011 10:20:38 +0000 (12:20 +0200)

Trivial merge