]> mj.ucw.cz Git - libucw.git/commitdiff
Merge branch 'master' into dev-opt
authorPavel Charvat <pchar@ucw.cz>
Wed, 15 Jan 2014 12:33:15 +0000 (13:33 +0100)
committerPavel Charvat <pchar@ucw.cz>
Wed, 15 Jan 2014 12:33:15 +0000 (13:33 +0100)

Trivial merge