From: Andre Noll <maan@systemlinux.org>
Date: Sat, 24 Oct 2009 19:24:33 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.0~6
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f948a91c447ac2fa070c0b7a6c57b83b7dfdd56c;hp=f948a91c447ac2fa070c0b7a6c57b83b7dfdd56c

Merge branch 'maint'
---