Merge pull request #440 from ErikDubbelboer/spelling

author Salvatore Sanfilippo <antirez@gmail.com>

Sat, 21 Apr 2012 10:31:06 +0000 (03:31 -0700)

committer Salvatore Sanfilippo <antirez@gmail.com>

Sat, 21 Apr 2012 10:31:06 +0000 (03:31 -0700)
author Salvatore Sanfilippo <antirez@gmail.com>
Sat, 21 Apr 2012 10:31:06 +0000 (03:31 -0700)
committer Salvatore Sanfilippo <antirez@gmail.com>
Sat, 21 Apr 2012 10:31:06 +0000 (03:31 -0700)
diff --cc src/dict.c
Simple merge
diff --cc src/rdb.c
Simple merge
author	Salvatore Sanfilippo <antirez@gmail.com>
	Sat, 21 Apr 2012 10:31:06 +0000 (03:31 -0700)
committer	Salvatore Sanfilippo <antirez@gmail.com>
	Sat, 21 Apr 2012 10:31:06 +0000 (03:31 -0700)
		1	2
src/dict.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/rdb.c	patch \|	diff1 \|	diff2 \|	blob \| history