]> mj.ucw.cz Git - libucw.git/commitdiff
Merge branch 'dev-admin'
authorMartin Mares <mj@ucw.cz>
Mon, 14 Jul 2008 14:32:06 +0000 (16:32 +0200)
committerMartin Mares <mj@ucw.cz>
Mon, 14 Jul 2008 14:32:06 +0000 (16:32 +0200)

Trivial merge