From: Andre Noll <maan@systemlinux.org>
Date: Mon, 30 Jan 2012 07:30:40 +0000 (+0100)
Subject: Merge commit '1678ee'
X-Git-Tag: v0.4.10~14
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e5fbc490c2c16ecfa7bce58a18e11a0f7d382b91;p=paraslash.git

Merge commit '1678ee'
---

e5fbc490c2c16ecfa7bce58a18e11a0f7d382b91