From: Andre Noll <maan@systemlinux.org>
Date: Thu, 7 May 2009 17:03:49 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: v0.3.5~61
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=318fbe90e08b6d9c5e781d9b517b670c5a1a04d7;p=paraslash.git

Merge branch 'next'
---

318fbe90e08b6d9c5e781d9b517b670c5a1a04d7