]> git.cameronkatri.com Git - cgit.git/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 17:30:02 +0000 (18:30 +0100)
committerLars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 17:30:02 +0000 (18:30 +0100)
1  2 
cgit.c

diff --cc cgit.c
Simple merge