From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 14 Jul 2010 19:38:19 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/0.5-2~1
X-Git-Url: https://git.deb.at/w?p=pkg%2Fnetris.git;a=commitdiff_plain;h=bc465ddcdbbbc2ceae0cf460fa5a2c6b02aba990

Merge branch 'upstream'
---

bc465ddcdbbbc2ceae0cf460fa5a2c6b02aba990