From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 14 Jan 2012 13:24:05 +0000 (+0100)
Subject: Merge branch 'master' into config
X-Git-Tag: v3.2~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e98dd744385b7ec45895005a8765552e7c3cd1fa;p=thirdparty%2Fccache.git

Merge branch 'master' into config

* master:
  Prepare for v3.1.7
---

e98dd744385b7ec45895005a8765552e7c3cd1fa