[SCM] cytadela: old-school first person shooter branch, master, updated. upstream/0.9-15-ge9737bb

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 20c0d12c0f7cdc52b2426a5a09c081d542548c2b
Merge: df689a5fc0354d115f785654924c69186db26ec2 9af435503ecc2c24b4de1c431283793f227d9567
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Fri Jul 2 21:13:49 2010 +0200

    Merge commit 'upstream/1.0.1'


-- 
cytadela: old-school first person shooter