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

Conflicts:
	cgit.c
	cgit.h
---
(limited to 'tests/t0104-tree.sh')

--
cgit v0.9.0.2