Merge branch 'stable'

* stable:
  CGIT 0.7.1
  Makefile install: include cgit.png, do not empty cache

Conflicts:

	Makefile

diff --cc Makefile
index dbc34a263625557d1c439687b8eff453da49082e,27e966dcd4d89bbd4292d79c690fc6154720190c..685e662cebf0398f5d461fc31ecf16b35a4ef89f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -19,12 -19,7 +19,12 @@@ OBJECTS = shared.o cache.o parsing.o ht
        ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
  
  
- .PHONY: all git install clean distclean force-version get-git
 +ifdef NEEDS_LIBICONV
 +      EXTLIBS += -liconv
 +endif
 +
 +
+ .PHONY: all git install clean distclean emptycache force-version get-git
  
  all: cgit git