From: Andre Noll <maan@systemlinux.org>
Date: Fri, 4 Apr 2008 12:19:45 +0000 (+0200)
Subject: Merge commit 'remotes/lamarck/master'
X-Git-Tag: v0.3.2~12
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=77217baa3a50ca051ec4341c96e3fa7e46ceec19;hp=--cc

Merge commit 'remotes/lamarck/master'
---

77217baa3a50ca051ec4341c96e3fa7e46ceec19