From 1b09cbd303d889ec2636127584d57b7f1b70c25e Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 05 Mar 2011 13:01:59 +0000
Subject: Merge branch 'stable'

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

--
cgit v0.9.0.2