From: Pavel Charvat <pchar@ucw.cz>
Date: Wed, 4 Jun 2014 00:14:54 +0000 (+0200)
Subject: Merge branch 'master' into table
X-Git-Tag: v6.0~13^2~2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=ae7dfec55384883a72867d4877b5283a3c1c8aa1;p=libucw.git

Merge branch 'master' into table

Conflicts:
	ucw/mempool.c
---

ae7dfec55384883a72867d4877b5283a3c1c8aa1