Merge pull request #586 from saj/aof_last_bgrewrite_status

author Salvatore Sanfilippo <antirez@gmail.com>

Fri, 27 Jul 2012 10:55:20 +0000 (03:55 -0700)

committer Salvatore Sanfilippo <antirez@gmail.com>

Fri, 27 Jul 2012 10:55:20 +0000 (03:55 -0700)
author Salvatore Sanfilippo <antirez@gmail.com>
Fri, 27 Jul 2012 10:55:20 +0000 (03:55 -0700)
committer Salvatore Sanfilippo <antirez@gmail.com>
Fri, 27 Jul 2012 10:55:20 +0000 (03:55 -0700)
diff --cc src/redis.c
Simple merge
diff --cc src/redis.h
Simple merge
author	Salvatore Sanfilippo <antirez@gmail.com>
	Fri, 27 Jul 2012 10:55:20 +0000 (03:55 -0700)
committer	Salvatore Sanfilippo <antirez@gmail.com>
	Fri, 27 Jul 2012 10:55:20 +0000 (03:55 -0700)
		1	2
src/redis.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.h	patch \|	diff1 \|	diff2 \|	blob \| history