update
Merge branch 'master' of https://github.com/cursecatcher/memcached4chaos

Conflicts:
	test.cpp
diomerda