From: Snafu <stuff@c-gabriel.at>
Date: Sun, 9 May 2010 09:37:52 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=testub10.git;a=commitdiff_plain;h=7c2cde691b9eb061a0682a7971c63f2c42b39c2c

Merge commit 'origin/master'
---

7c2cde691b9eb061a0682a7971c63f2c42b39c2c