Merge commit 'lewurm/master' into local
authorSnafu <stuff@c-gabriel.at>
Sun, 9 May 2010 21:43:47 +0000 (23:43 +0200)
committerSnafu <stuff@c-gabriel.at>
Sun, 9 May 2010 21:43:47 +0000 (23:43 +0200)
commitdd01ccfab821664aedfea971092ea2606dd39dae
treedd708f81d347813c8f521635a0921c87b6fb2aff
parent657292e98f8b83942bb966a07a0d28c7fb29a238
parent702ec321eb693644d24ff65c876c65833912f0e2
Merge commit 'lewurm/master' into local