From b8a7eb12d459c48943e31762b24b169af8c427a1 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 06 Nov 2008 18:18:27 +0000
Subject: Merge branch 'stable'

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

--
cgit v0.9.0.2