modified:   cdeploy.sh
	modified:   pweb.sqlite
Merge branch 'master' of https://github.com/srcvirus/klink

Conflicts:
	pweb.sqlite

	modified:   init_db.cc
	modified:   plnode/db/pweb_db.h
	deleted:    pweb.sqlite
	modified:   server_system_test.cc
Merge branch 'master' of https://github.com/srcvirus/klink

Conflicts:
	pweb.sqlite

	modified:   cdeploy.sh
Merge branch 'master' of https://github.com/srcvirus/klink

Conflicts:
	pweb.sqlite

	new file:   pweb.sqlite