Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 14 Mar 2008 22:45:31 +0000 (18:45 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 14 Mar 2008 22:45:31 +0000 (18:45 -0400)
commit44d4f086efcd5e777e100eeca078fc6eafaf9476
tree018ecb3bf8bbe1f9ab9532e656bbcf786d1bd3eb
parent16299dbae894b916e776da3bb6aea2a44c15501a
parent3d40fd88a54890d280aec6744d88f9f9ecfe12be
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info