From: Pavel Charvat <pchar@ucw.cz>
Date: Wed, 15 Jan 2014 12:33:15 +0000 (+0100)
Subject: Merge branch 'master' into dev-opt
X-Git-Tag: v5.99~25^2~28
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=cc27fd6a041748623f2bdb9da0cb431bfa8ff885;p=libucw.git

Merge branch 'master' into dev-opt
---

cc27fd6a041748623f2bdb9da0cb431bfa8ff885