From: Andre Noll <maan@systemlinux.org>
Date: Thu, 13 May 2010 11:08:59 +0000 (+0200)
Subject: Merge branch 't/nonblock_api'
X-Git-Tag: v0.4.3~25
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=5b15980ce22a3a4244e2440f46eac19eb0ceb3ef;p=paraslash.git

Merge branch 't/nonblock_api'
---

5b15980ce22a3a4244e2440f46eac19eb0ceb3ef