From: Joel Rosdahl <joel@rosdahl.net>
Date: Tue, 27 Oct 2015 21:14:36 +0000 (+0100)
Subject: Merge branch '3.2-maint'
X-Git-Tag: v3.3~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48b353ba8513750e9ebb09659ffa0453bbf5af6c;p=thirdparty%2Fccache.git

Merge branch '3.2-maint'

* 3.2-maint:
  Correct manual regarding __DATE_, __TIME__ and __FILE__ macros
  Include m4 files used by configure.ac in dist archive

Conflicts:
	NEWS.txt
---

48b353ba8513750e9ebb09659ffa0453bbf5af6c