From: Snafu <stuff@c-gabriel.at>
Date: Sun, 9 May 2010 21:43:47 +0000 (+0200)
Subject: Merge commit 'lewurm/master' into local
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=testub10.git;a=commitdiff_plain;h=dd01ccfab821664aedfea971092ea2606dd39dae

Merge commit 'lewurm/master' into local
---

dd01ccfab821664aedfea971092ea2606dd39dae