From: Pavel Charvat <pchar@ucw.cz>
Date: Tue, 14 Jan 2014 19:51:05 +0000 (+0100)
Subject: Merge branch 'master' into dev-opt
X-Git-Tag: v5.99~25^2~30
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=28388e8af05157d893f76c82599a7c15085ebf8a;p=libucw.git

Merge branch 'master' into dev-opt

Conflicts:
	ucw/ff-varint.c
	ucw/varint.c
---

28388e8af05157d893f76c82599a7c15085ebf8a