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

Merge branch 'maint'

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

bcbad0992488c1ad0e0211141f6588b3c17c77c0