From: Andre <maan@p133.(none)>
Date: Wed, 10 May 2006 23:08:50 +0000 (+0200)
Subject: Merge branch 'master' into aac
X-Git-Tag: v0.2.14~140
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=5a506c5917569033b95d36f6425ec7f54e7d022a

Merge branch 'master' into aac

Conflicts:

	configure.ac

configure.ac looks fine. Why the hell is git complaining?
nothing to commit
---

5a506c5917569033b95d36f6425ec7f54e7d022a