From: Joel Rosdahl Date: Fri, 7 Aug 2015 15:50:44 +0000 (+0200) Subject: Merge branch '3.2-maint' X-Git-Tag: v3.3~160 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0e58bf30e46a7cb43299d50aecba6e758cbc372;p=thirdparty%2Fccache.git Merge branch '3.2-maint' * 3.2-maint: uncrustify: Add sp_after_comma Don't mention source code hash bug fix in 3.2.2 --- e0e58bf30e46a7cb43299d50aecba6e758cbc372