From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 21 Aug 2011 14:47:27 +0000 (+0200)
Subject: Merge branch 'master' into config
X-Git-Tag: v3.2~174
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f99c2f364a8fc43d9efe9de80735fbd1e077594e;p=thirdparty%2Fccache.git

Merge branch 'master' into config

* master:
  Tweak news markup
  Prepare for v3.1.6
---

f99c2f364a8fc43d9efe9de80735fbd1e077594e