From 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 10:29:22 +0000
Subject: Merge branch 'lh/embedded'

Conflicts:
	cgitrc.5.txt
	ui-shared.c
---
(limited to 'scan-tree.c')

--
cgit v0.9.0.2