Peter Korsgaard fe1b2ef1d3 Merge branch 'next' ... Conflicts: Makefile package/flac/0001-fix-altivec-logic.patch package/grantlee/Config.in Signed-off-by: Peter Korsgaard <peter@korsgaard.com>		2014-12-01 11:16:42 +01:00
..
Config.in
squid-01-assume-get-certificate-ok.patch
squid-02-missing-include-time_h.patch
squid.hash
squid.mk	package/squid: enable ICAP client support in squid	2014-11-23 22:18:29 +01:00