]> granicus.if.org Git - cgit/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Wed, 15 Jun 2011 08:40:00 +0000 (10:40 +0200)
committerLars Hjemli <hjemli@gmail.com>
Wed, 15 Jun 2011 08:40:00 +0000 (10:40 +0200)
1  2 
cgitrc.5.txt

diff --cc cgitrc.5.txt
Simple merge