merge with debian-sid release 0.8.15
authorDavid Kalnischkies <kalnischkies@gmail.com>
Wed, 29 Jun 2011 14:29:54 +0000 (16:29 +0200)
committerDavid Kalnischkies <kalnischkies@gmail.com>
Wed, 29 Jun 2011 14:29:54 +0000 (16:29 +0200)

Trivial merge