]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 00:49:37 +0000 (19:49 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 11 Nov 2008 00:49:37 +0000 (19:49 -0500)
commit1c4a4a41e1c96d0f486a7b039718dd5f35865af2
treec2598531b594ca08f826419b08f8bb0469daa55b
parentf8a09ba105e0b58ec59fe4cd8d92a1577cce14d2
parent17731892ec458ee6b1b68ce62bf30ad129c87e79
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info