Merge branch 'f18' into f17

Merge branch 'master' into f17
Conflicts: .gitignore redis.spec sources
2012-12-27 09:35:57 -05:00 · 2012-07-08 21:54:04 -04:00 · 2012-05-19 08:06:32 -04:00 · 2012-04-01 10:34:28 -04:00 · 2012-02-25 00:23:56 -05:00
1 changed files with 1 additions and 1 deletions
--- a/redis.spec
+++ b/redis.spec
@ -132,7 +132,7 @@ fi
 * Sat Mar 31 2012 Silas Sewell <silas@sewell.org> - 2.4.10-1
 - Update to redis 2.4.10

-* Fri Feb 24 2012 Silas Sewell <silas@sewell.org> - 2.4.8-1
+* Sat Feb 25 2012 Silas Sewell <silas@sewell.org> - 2.4.8-1
 - Update to redis 2.4.8

 * Sat Feb 04 2012 Silas Sewell <silas@sewell.org> - 2.4.7-1
Author	SHA1	Message	Date
Silas Sewell	c3cf5fefe5	Merge branch 'f18' into f17	2012-12-27 09:35:57 -05:00
Silas Sewell	69b487ff9e	Merge branch 'master' into f17 Conflicts: .gitignore redis.spec sources	2012-07-08 21:54:04 -04:00
Silas Sewell	4fba3d361f	Update to redis 2.4.13	2012-05-19 08:06:32 -04:00
Silas Sewell	6841a89637	Version 2.4.10	2012-04-01 10:34:28 -04:00
Silas Sewell	56a424ddb0	Update to redis 2.4.8	2012-02-25 00:23:56 -05:00