From d6174b7aab476c2b6a86e59d98cf978d603045f4 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 29 Jan 2009 21:21:24 +0000
Subject: Merge branch 'stable'

---
(limited to 'ui-diff.c')

--
cgit v0.9.0.2