From: Andre Noll <maan@systemlinux.org>
Date: Thu, 23 Jun 2011 17:13:40 +0000 (+0200)
Subject: Merge branch 't/hup_fix'
X-Git-Tag: v0.4.8~30
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=6974e18e86064f870ff1c130b11ececc3e261158

Merge branch 't/hup_fix'
---

6974e18e86064f870ff1c130b11ececc3e261158