From: Andre Noll <maan@systemlinux.org>
Date: Sun, 17 Jan 2010 20:36:41 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.2~81
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f42b5eccb6ec3364dc0500ffeffbe9d9ecab07bd

Merge branch 'master' into next

Conflicts:
	stdin.c
---

f42b5eccb6ec3364dc0500ffeffbe9d9ecab07bd