From: Martin Mares <mj@ucw.cz>
Date: Sun, 31 Jul 2011 12:44:25 +0000 (+0200)
Subject: Merge branch 'dev-mainloop'
X-Git-Tag: v5.0~118
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e52292f0ab9c7fb5b6d52c429b6d3113b72506da;p=libucw.git

Merge branch 'dev-mainloop'
---

e52292f0ab9c7fb5b6d52c429b6d3113b72506da