Merge remote branch 'refs/remotes/origin/diabolik/sourceforplayers'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 18:43:55 +0000 (20:43 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 18:43:55 +0000 (20:43 +0200)
commit7183dd2e8f8c1df74854c521113167e18f69f88e
treeb2f2b2b964b4a5793baa8108a76af4caeb825d38
parentdd1ba05e5e25707371171d7cd3dd1bc8ae040d0d
parent4b016c791ca34036548b0e5e10f1be42f1ca49bc
Merge remote branch 'refs/remotes/origin/diabolik/sourceforplayers'