[widelands/f14/master: 2/2] Merge remote-tracking branch 'origin/master' into f14/master

[Hans de Goede]

commit 6dab3a39f837418c95cc7fb9ca1fb4697ea7baab
Merge: f5eb0b2 b21bb04
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Apr 27 19:00:07 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14/master

 widelands.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---