Merge branch 'master' of ssh://kyberia.cz/srv/git/kyberia-bloodline

author Daniel Hromada <hromi@Aphrodité.(none)>

Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)

committer Daniel Hromada <hromi@Aphrodité.(none)>

Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)
author Daniel Hromada <hromi@Aphrodité.(none)>
Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)
committer Daniel Hromada <hromi@Aphrodité.(none)>
Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)
diff --cc wwwroot/backend/mysql/backend.inc
Simple merge
diff --cc wwwroot/inc/eventz/verify.inc
Simple merge
diff --cc wwwroot/nodes.php
Simple merge
author	Daniel Hromada <hromi@Aphrodité.(none)>
	Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)
committer	Daniel Hromada <hromi@Aphrodité.(none)>
	Tue, 15 Mar 2011 22:25:14 +0000 (23:25 +0100)
		1	2
wwwroot/backend/mysql/backend.inc	patch \|	diff1 \|	diff2 \|	blob \| history
wwwroot/inc/eventz/verify.inc	patch \|	diff1 \|	diff2 \|	blob \| history
wwwroot/nodes.php	patch \|	diff1 \|	diff2 \|	blob \| history