Merge remote branch 'origin/parasti/mortar-bounce'
authorRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 13:18:01 +0000 (15:18 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 13:18:01 +0000 (15:18 +0200)

Trivial merge