Merge commit 'lewurm/master'
authorSnafu <stuff@c-gabriel.at>
Mon, 17 May 2010 18:23:48 +0000 (20:23 +0200)
committerSnafu <stuff@c-gabriel.at>
Mon, 17 May 2010 18:23:48 +0000 (20:23 +0200)
commit7d81ab73fb087123f5ec00eeede277e71e6792c8
treef05a0c63e8ee63c27c3305424706804769f46eef
parentd37ec1b24167bcaf381f39c907f4bb95fffc2088
parenta6e4532839c2828149ebca0eff8eaa5800f8ac32
Merge commit 'lewurm/master'