[redis/f17: 3/3] Merge branch 'f18' into f17

[Silas Sewell]

commit c3cf5fefe5af4b649170f4591e320d1f912e7b27
Merge: 69b487f 984073b
Author: Silas Sewell <silas at sewell.org>
Date:   Thu Dec 27 09:35:57 2012 -0500

    Merge branch 'f18' into f17

 .gitignore                                         |    1 +
 ...edis.conf.patch => redis-2.6.7-redis.conf.patch |   19 +++++++------------
 redis.spec                                         |   12 +++++++++---
 sources                                            |    1 +
 4 files changed, 18 insertions(+), 15 deletions(-)
---