From: Andre Noll <maan@systemlinux.org>
Date: Thu, 5 Nov 2009 21:43:03 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~5
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=a4eb244ecdf9aaa0f167b3c91d3e276bde99d681;hp=--cc;p=paraslash.git

Merge branch 'maint'
---

a4eb244ecdf9aaa0f167b3c91d3e276bde99d681