From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 13 Jun 2011 22:02:02 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/859d106d5e8d884bf8f25b2ceea8600b2987c387?ds=inline;hp=859d106d5e8d884bf8f25b2ceea8600b2987c387

Merge branch 'stable'

Conflicts:
	cgitrc.5.txt
---