From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 9 Aug 2009 11:46:01 +0000 (+0200)
Subject: Merge branch 'lh/plugins'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/db6303b58883c4417f5bcc0c1ee34fed6553dca3?hp=db6303b58883c4417f5bcc0c1ee34fed6553dca3

Merge branch 'lh/plugins'

Conflicts:
	cgit.c
	cgit.h
---