]> 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>
Thu, 8 Apr 2010 20:09:31 +0000 (16:09 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Apr 2010 20:09:31 +0000 (16:09 -0400)
commit5daed5c65a8ad2578ab0df37d59c6bde04c384ab
treeee39e94db825c47195b7d921d55caa23ac3c882d
parenta4a63cb7f9dcafb72810ba1a2ad69654cb8199d2
parentce9cf967d01eb8e112c19d9f7b1c9a727717ef30
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info