]> mj.ucw.cz Git - libucw.git/commit
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)
commitcc27fd6a041748623f2bdb9da0cb431bfa8ff885
tree639aa16ffa9f37aa03e0c29212a9852f53d9a460
parentb1f7cfb12a103c904184af46008f1b147498c174
parent0deec3a7b88a7b2ffa16c279bb29916f149095d7
Merge branch 'master' into dev-opt