From: Joel Rosdahl Date: Sat, 19 Dec 2015 16:20:26 +0000 (+0100) Subject: Merge branch '3.2-maint' X-Git-Tag: v3.3~137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db7182e1cc482a7f046032bf949416fb3cb0e24b;p=thirdparty%2Fccache.git Merge branch '3.2-maint' * 3.2-maint: Add travis configuration Update NEWS Don't assume that mkstemp leaves template unmodified on error Conflicts: .travis.yml --- db7182e1cc482a7f046032bf949416fb3cb0e24b