Don't echo things in a run which doesn't do anything
Don't echo things in a run which doesn't do anything
Merge branch 'master' of github.com:karpenoktem/knfotos
Merge branch 'master' into ayke-video (conflict)

Conflicts:
	updatedb.php