From 9dda602ca3deaf9a78a90f4ba77008569ead5a4f Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 01 Oct 2007 10:51:04 +0000
Subject: Merge branch 'stable'

* stable:
  Use git-1.5.3.3
---
(limited to 'ui-diff.c')

--
cgit v0.9.0.2