Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
Merge remote-tracking branch 'antirez/2.6' into 2.6
LASTSAVE is a "random" command.
Make all WATCHers dirty when the slave reloads the DB.
Merge remote-tracking branch 'antirez/2.6' into 2.6

Conflicts:
	src/replication.c
Merge branch '2.6' into rdio-2.6