Merge branch 'ad/memcached'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 17:57:56 +0000 (19:57 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 17:57:56 +0000 (19:57 +0200)
commitd31f8651c7d7c25795f0047f10052be66a4cbdcc
treed24bb5d9614108ae2937501c8b9368ce20d8b850
parentaf1f4809cb0a26cdff94c9c84bd4accf0249a79a
parent37932f90388cfc4fd96ec9cc85bc9b4315ea5b8e
Merge branch 'ad/memcached'