From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 5 Aug 2015 15:48:00 +0000 (+0200)
Subject: Merge branch '3.2-maint'
X-Git-Tag: v3.3~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7859fbed83b6dabea633f10ea710b605fd03289f;p=thirdparty%2Fccache.git

Merge branch '3.2-maint'

* 3.2-maint:
  test: Make subst_env_in_string not depend on existing environment
  Update source code style according to uncrustify
  Add uncrustify config and make rule
  Source code style tweaks
  Minor tweaking to comments
  Only log "Disabling direct mode" once when failing to read include file
---

7859fbed83b6dabea633f10ea710b605fd03289f