Merge remote branch 'refs/remotes/origin/tzork/turrets'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 18:14:42 +0000 (20:14 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 18:14:42 +0000 (20:14 +0200)
commit477b7b3e324bdb74aee19bfee925d708c7cf9758
tree442c6863f6cfc466a7eaf5210d87f38a7702946c
parentc0a62f7fed5232a6bb4058e7bfe3d2ed1355ba3f
parent0a103f215dcfc3f47fbcceba5cb950cbdbb723bd
Merge remote branch 'refs/remotes/origin/tzork/turrets'