c2
Merge branch 'master' of git@github.com:clues/ssq.git

Conflicts:
	src/ssqiu_server.erl
	test/ssqiu_server_SUITE.erl
Merge branch 'master' of git@github.com:clues/ssq.git

Conflicts:
	src/ssqiu_server.erl
	test/ssqiu_server_SUITE.erl