From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Apr 2010 23:14:18 +0000 (+0200)
Subject: Merge remote branch 'athcx/v0.2' into v0.2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=c44b4b4d6b229e64389947ede9c4716969f2a780;hp=-c

Merge remote branch 'athcx/v0.2' into v0.2
---

c44b4b4d6b229e64389947ede9c4716969f2a780