test
Merge branch 'master' of github.com:mukezhai/node-sphinxapi

Conflicts:
	test