From: Andre <maan@p133.(none)>
Date: Fri, 12 May 2006 15:00:10 +0000 (+0200)
Subject: Merge branch 'master' into aac
X-Git-Tag: v0.2.14~139
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=67cc91aedd748c8b6dee29b5203e17e68530fd21;p=paraslash.git

Merge branch 'master' into aac

Conflicts:

	Makefile.in

Makefile.in looks fine. WTF is git complaining about?
---

67cc91aedd748c8b6dee29b5203e17e68530fd21