From: Tomas Valla <tom@ucw.cz>
Date: Fri, 6 Sep 2013 10:11:27 +0000 (+0200)
Subject: Merge branch 'master' into dev-opt
X-Git-Tag: v5.99~25^2~34
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=0b276b599d8d1a8a65c7b826e74fd9c6b6f5560f;p=libucw.git

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

0b276b599d8d1a8a65c7b826e74fd9c6b6f5560f