From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 28 Feb 2018 21:13:04 +0000 (+0100)
Subject: Merge branch '3.4-maint'
X-Git-Tag: v3.5~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b4f2cc8efac86bbb43bba541a441ff8a6cd6416;p=thirdparty%2Fccache.git

Merge branch '3.4-maint'

* 3.4-maint:
  The Dockerfile was moved to a subdirectory
---

3b4f2cc8efac86bbb43bba541a441ff8a6cd6416