Merge branch '3.0' of https://github.com/antirez/redis into unstable

Conflicts:
	00-RELEASENOTES
	tests/sentinel.tcl
Removed logs
Merge branch 'unstable' into 3.0

Conflicts:
	tests/sentinel.tcl