From: Andre Noll <maan@systemlinux.org>
Date: Thu, 12 Nov 2009 23:48:19 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.1~115^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=5c07b5c17b25240495a0acee24ca6b03c8d81e72;hp=--cc

Merge branch 'maint'
---

5c07b5c17b25240495a0acee24ca6b03c8d81e72