Merge branch 'icculus'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000 (12:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000 (12:30 +0200)
commit64144b4a07584a4d46190f1a75446b7ad40e4dd7
tree837e597aff40242ae19b47b8b90fa0bb02cb754f
parent0138fccfb89921c01cd50c5a25e15384b7b70e89
parent1e42a4f0959d25b435d0b08e0cbe6521fbcced6d
Merge branch 'icculus'