From: Andre Noll <maan@systemlinux.org>
Date: Thu, 24 Mar 2011 12:20:13 +0000 (+0100)
Subject: Merge remote branch 'boock/master'
X-Git-Tag: v0.4.6~8^2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=4fc020328706c80e25c6138afb262a210560eeef;p=paraslash.git

Merge remote branch 'boock/master'
---

4fc020328706c80e25c6138afb262a210560eeef