From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 22 Jun 2010 14:16:12 +0000 (+0200)
Subject: Merge branch 'jh/context-lines'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/6f92f332e6a9ee3e16051bda9fe148607af67f65?hp=6f92f332e6a9ee3e16051bda9fe148607af67f65

Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h
---