]> 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>
Wed, 17 Sep 2008 19:57:42 +0000 (15:57 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 17 Sep 2008 19:57:42 +0000 (15:57 -0400)
commit6a90f5cb3fca4e5530b144cf5bb054c15798756e
treeb45376c1510a9b9f1c718e726a433e2564d5e80f
parent1cb4154bc8131ed317802ec9d39490237cd64462
parent6ca4038f377b1b7156b82bc2273684ce5d7bf110
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info