From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 22 Jun 2010 14:15:48 +0000 (+0200)
Subject: Merge branch 'jh/path-limit'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/37a24e4e39737edaa5cdde501346a65eeb280e63?hp=37a24e4e39737edaa5cdde501346a65eeb280e63

Merge branch 'jh/path-limit'

Conflicts:
	cgit.h
	ui-commit.c
---