From db8b8cb9467625cb8d9ecb67863aa67590e59cc0 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 09 Aug 2009 11:46:34 +0000
Subject: Merge branch 'lh/about'

Conflicts:
	cgit.h
---
(limited to 'ui-shared.c')

--
cgit v0.9.0.2