From: Andre Noll <maan@systemlinux.org>
Date: Thu, 13 May 2010 18:13:02 +0000 (+0200)
Subject: Merge remote branch 'fml/master'
X-Git-Tag: v0.4.3~23
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=840725e10602abd8187428924040f4bf3e04594c;p=paraslash.git

Merge remote branch 'fml/master'
---

840725e10602abd8187428924040f4bf3e04594c