Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 28 Dec 2007 21:15:23 +0000 (16:15 -0500)
committerJoey Hess <joey@kitenet.net>
Fri, 28 Dec 2007 21:15:23 +0000 (16:15 -0500)
commit1bed8653606bdaa778e34fdf6b257b7e27f0598b
treec3a5b122b8251f70a10fca34982e410093721a25
parentc2afda7f90c595d3256625c81aabc90252b7b07f
parentd72b92c44317d0ca98324d29af660f50d3e814c9
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info