Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 29 Sep 2008 17:26:52 +0000 (13:26 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 29 Sep 2008 17:26:52 +0000 (13:26 -0400)
commit71affd80d70c0e45c804e72915b23217539d0c26
treeac3e4adfa1f15723aefbf1fa48c97fa278d126b4
parentc4be16703fa571e8922b43446b24cf1c4f90a371
parent9b279838080de8740f15b7fc91ffc4bd473b8823
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info