From: Andre Noll <maan@systemlinux.org>
Date: Mon, 31 Aug 2009 19:37:03 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~32
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=8970261c6574f5a46941308ac68a17dc01bbd11f

Merge branch 'master' into next

Conflicts:
	aft.c
	command.c
---

8970261c6574f5a46941308ac68a17dc01bbd11f