From 71d3ca75d1e941948dd3b965f5a5c2f2865e94fd Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 27 Feb 2010 11:53:27 +0000
Subject: Merge branch 'stable'

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

--
cgit v0.9.0.2