Merge branch 'plain-etag'

Conflicts:
	ui-shared.c

cgit.h

@@ -180,6 +180,7 @@ struct cgit_page {
 	char *mimetype;
 	char *charset;
 	char *filename;
+	char *etag;
 	char *title;
 	int status;
 	char *statusmsg;