From 3157ea3b7e5204dba2892ffb54d641746c4c7ca4 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 06 Dec 2008 10:33:05 +0000
Subject: Merge branch 'stable'

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

--
cgit v0.9.0.2