From: The PCI ID Mail Robot <pciids@ucw.cz>
Date: Mon, 6 Oct 2008 16:29:14 +0000 (+0200)
Subject: Merge branch 'master' of /home/vorner/pciids
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=b7fefe5ac58740241c7dc6bc56db210a187b3ece;p=pciids.git

Merge branch 'master' of /home/vorner/pciids

Conflicts:

	static/screen.css
---

b7fefe5ac58740241c7dc6bc56db210a187b3ece