From: Andre Noll <maan@systemlinux.org>
Date: Mon, 7 Jun 2010 08:16:41 +0000 (+0200)
Subject: Merge remote branch 'meins/master'
X-Git-Tag: v0.4.3~19
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=7a1764a24f86bd33beff864b52605ae739a65ca5;p=paraslash.git

Merge remote branch 'meins/master'
---

7a1764a24f86bd33beff864b52605ae739a65ca5