search wasn't noted correctly ...
Merge branch 'master' of https://github.com/Nothing2Do/diary-shell

Conflicts:
	alias.sql

unknown