From: Andre Noll <maan@systemlinux.org>
Date: Wed, 25 Aug 2010 01:11:26 +0000 (+0200)
Subject: Merge remote branch 's/v0.2' into v0.2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a028d19376c4fffdce3a2f22a047061d693464ce;hp=-c

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

a028d19376c4fffdce3a2f22a047061d693464ce