From: Andre Noll <maan@systemlinux.org>
Date: Sat, 22 Nov 2008 22:38:39 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.1.0~23
X-Git-Url: http://git.tuebingen.mpg.de/versions/paraslash-0.3.1.tar.bz2.asc?a=commitdiff_plain;h=22a0aa79753b19604a6fa4273f1479ef71dbf06d;p=adu.git

Merge commit 'fml/master'
---

22a0aa79753b19604a6fa4273f1479ef71dbf06d