Merge branch 'ff/redis' into ad/redis
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:43:33 +0000 (18:43 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:43:33 +0000 (18:43 +0200)
commite76aaa05606e1dfb443a4e4c7028c0ee6ed558e3
tree9b0c2cd2d1bf6a927ca2c83dc2f1bb1c9f5739fc
parent7983affe67549ba8d84606f5ada0b98325687d13
parent3e2a37d253db4eb286445e696029506c1bcec34a
Merge branch 'ff/redis' into ad/redis