From: Andre Noll <maan@systemlinux.org>
Date: Mon, 12 Apr 2010 16:12:31 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.2~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=b0fe6d882dd35b01360a66e130d6714aff7b6a0d;hp=--cc

Merge branch 'maint'
---

b0fe6d882dd35b01360a66e130d6714aff7b6a0d