Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 24 Aug 2009 18:05:11 +0000 (14:05 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 24 Aug 2009 18:05:11 +0000 (14:05 -0400)
commit05c1730064296712535ae553df8c3950fe487ae8
treecb76018ae479b976edaf894a0306e89d1dfb4855
parent156625ebac9fdd6d7193c5d997e6fd0141d4d84b
parent8d504e6b3dcacd333c0b07387e7acd3bf8a65d9c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info