From: Andre Noll <maan@systemlinux.org>
Date: Mon, 13 Aug 2012 08:08:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'boock/master'
X-Git-Tag: v0.4.12~38
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=7d2daa840a106fd845f81d96fe45902b5e7d23f5;p=paraslash.git

Merge remote-tracking branch 'boock/master'
---

7d2daa840a106fd845f81d96fe45902b5e7d23f5