From: Martin Mares <mj@ucw.cz>
Date: Mon, 14 Jul 2008 14:32:06 +0000 (+0200)
Subject: Merge branch 'dev-admin'
X-Git-Tag: holmes-import~404^2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=76e3cc5962548e62c7fc5e96f43fdb85a3446296;p=libucw.git

Merge branch 'dev-admin'
---

76e3cc5962548e62c7fc5e96f43fdb85a3446296