]> mj.ucw.cz Git - libucw.git/commitdiff
Merge branch 'master' into dev-opt
authorTomas Valla <tom@ucw.cz>
Fri, 6 Sep 2013 10:11:27 +0000 (12:11 +0200)
committerTomas Valla <tom@ucw.cz>
Fri, 6 Sep 2013 10:11:27 +0000 (12:11 +0200)

Trivial merge