]> git.saurik.com Git - redis.git/commitdiff
Merge remote branch 'origin/unstable' into unstable
authorantirez <antirez@gmail.com>
Sat, 25 Jun 2011 10:22:59 +0000 (12:22 +0200)
committerantirez <antirez@gmail.com>
Sat, 25 Jun 2011 10:22:59 +0000 (12:22 +0200)
1  2 
src/Makefile

diff --cc src/Makefile
Simple merge