]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 9 Jan 2010 21:20:14 +0000 (16:20 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 9 Jan 2010 21:20:14 +0000 (16:20 -0500)
commit9dbeb003df73ff04fe608558004a6bfe4e3eaf78
treede8720af0d18c2a96a8d8c765a1953d1abf959ac
parent59d929d6b1271c84c6d17ffbff65b57bf67d49e6
parentfe0f6866841d6fb6e85dec42e88c56114d98e7f4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info