]> gitweb.ps.run Git - ps-cgit/commit
Merge branch 'lh/about'
authorLars Hjemli <hjemli@gmail.com>
Sun, 9 Aug 2009 11:46:34 +0000 (13:46 +0200)
committerLars Hjemli <hjemli@gmail.com>
Sun, 9 Aug 2009 11:46:34 +0000 (13:46 +0200)
commitdb8b8cb9467625cb8d9ecb67863aa67590e59cc0
treed27644fc1b98ec6365e74f3ba40c19f78f8a287f
parentdb6303b58883c4417f5bcc0c1ee34fed6553dca3
parent537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4
Merge branch 'lh/about'

Conflicts:
cgit.h
cgit.c
cgit.h
cgitrc.5.txt