From: Andre Noll <maan@systemlinux.org>
Date: Sun, 1 Aug 2010 11:25:59 +0000 (+0200)
Subject: Merge branch 't/error2'
X-Git-Tag: v0.4.4~6
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=75cf863ef7a7cf5fe346f098ffb07a472b8366ec

Merge branch 't/error2'
---

75cf863ef7a7cf5fe346f098ffb07a472b8366ec