Merge branch 'master' of git+ssh://gitosis@nomeata.de/L-seed
authorSven Hecht <sven@sven-laptop.(none)>
Fri, 26 Jun 2009 16:55:24 +0000 (18:55 +0200)
committerSven Hecht <sven@sven-laptop.(none)>
Fri, 26 Jun 2009 16:55:24 +0000 (18:55 +0200)
commiteb8b555524384bf5e65af07ef38b81c4743a966b
treeb6d854ace76304add605364b71ff6dec1472a88d
parent038f060c9d5fda348c018b79b39458e1900a62ed
parentd2fd1649751e1afd9e96288ea114b46068426e4d
Merge branch 'master' of git+ssh://gitosis@nomeata.de/L-seed

Conflicts:
web/setup/script00.sql
web/js/communication.js
web/php/page/myplants.pg
web/php/page/nav.pg