From: Robert Kessl <kesslr@centrum.cz>
Date: Thu, 26 Jun 2014 14:51:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v6.1~16
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=698143f66b24a9d6c19dcd0276127fc6d6cce5be;p=libucw.git

Merge remote-tracking branch 'origin/master'
---

698143f66b24a9d6c19dcd0276127fc6d6cce5be