From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 8 Jan 2012 14:42:49 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~166^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cdd7980895683613026967ac190c4a5bea196f3;p=thirdparty%2Fccache.git

Merge branch 'maint'

* maint:
  Prepare for v3.1.7
---

5cdd7980895683613026967ac190c4a5bea196f3