From: Andre Noll <maan@systemlinux.org>
Date: Sun, 4 Apr 2010 23:27:23 +0000 (+0200)
Subject: Merge remote branch 'albrecht/master'
X-Git-Tag: v0.4.2~15
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a586ac33f5a699e406d3708988b6fa1fbe0ce3b7;p=paraslash.git

Merge remote branch 'albrecht/master'
---

a586ac33f5a699e406d3708988b6fa1fbe0ce3b7