]> git.cameronkatri.com Git - cgit.git/commitdiff
Merge branch 'fp/linenumbers'
authorLars Hjemli <hjemli@gmail.com>
Sun, 13 Sep 2009 20:01:52 +0000 (22:01 +0200)
committerLars Hjemli <hjemli@gmail.com>
Sun, 13 Sep 2009 20:01:52 +0000 (22:01 +0200)
1  2 
cgitrc.5.txt

diff --cc cgitrc.5.txt
Simple merge