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=refs%2Fheads%2Fv0.2;hp=f13b443e370c96812ab542372f2d956b1bbb2596

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