Merge branch 'ff/memcachec'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 7 Apr 2009 07:38:47 +0000 (09:38 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 7 Apr 2009 07:38:47 +0000 (09:38 +0200)

Trivial merge