From: Andre Noll <maan@systemlinux.org>
Date: Tue, 6 Oct 2009 17:31:41 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~15
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e61e21f2aae608ff694c924cdeb2056ac1136b77;p=paraslash.git

Merge branch 'maint'
---

e61e21f2aae608ff694c924cdeb2056ac1136b77