From 681fdc45473143de3f3c5f69fbc7b94f5d6b0b75 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 09:59:22 +0000
Subject: Merge branch 'plain-etag'

Conflicts:
	ui-shared.c
---
(limited to 'ui-patch.c')

--
cgit v0.9.0.2