From: Andre Noll <maan@systemlinux.org>
Date: Sat, 19 Dec 2009 15:50:39 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~5^2~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=fae6ed3cc6d240eefcc111bdd04f637e3cda5dd0

Merge branch 'maint'
---

fae6ed3cc6d240eefcc111bdd04f637e3cda5dd0