From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 09:59:22 +0000 (+0200)
Subject: Merge branch 'plain-etag'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/681fdc45473143de3f3c5f69fbc7b94f5d6b0b75?hp=681fdc45473143de3f3c5f69fbc7b94f5d6b0b75

Merge branch 'plain-etag'

Conflicts:
	ui-shared.c
---