From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 14 Dec 2014 20:47:37 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/kill_usleep'
X-Git-Tag: v0.5.4~44
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=d1e7875caba9aface190dab0de394435a80edd21;p=paraslash.git

Merge branch 'refs/heads/t/kill_usleep'
---

d1e7875caba9aface190dab0de394435a80edd21