]> git.cameronkatri.com Git - cgit.git/commit
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Mon, 13 Jun 2011 22:02:02 +0000 (22:02 +0000)
committerLars Hjemli <hjemli@gmail.com>
Mon, 13 Jun 2011 22:02:02 +0000 (22:02 +0000)
commit859d106d5e8d884bf8f25b2ceea8600b2987c387
tree6e9d5d910f175aefa1f337e431a33e7657ac4259
parentbe6991c1e42d548848bf2f51fd9910d14b5bdf40
parentef13e5eafe16474bb5b3c3b8156bbb24a9249b2e
Merge branch 'stable'

Conflicts:
cgitrc.5.txt
cgitrc.5.txt