From 6f92f332e6a9ee3e16051bda9fe148607af67f65 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 22 Jun 2010 14:16:12 +0000
Subject: Merge branch 'jh/context-lines'

Conflicts:
	cgit.c
	cgit.h
---
(limited to 'cgit.css')

--
cgit v0.9.0.2