]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 23 Nov 2007 16:44:43 +0000 (11:44 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 23 Nov 2007 16:44:43 +0000 (11:44 -0500)
commit2217e3d5bbb377bb40a5701e90341f011c49a536
tree99e0920c99db51260181b24f6d00beaa91910b47
parentc9c0f271b60e4a6ef8392cd3a5339d9c2368b494
parentb3f2ad90c0dfa070a8ba81a6ae83fc8c0b1665e2
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info