Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 5 Jan 2010 04:38:59 +0000 (23:38 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 5 Jan 2010 04:38:59 +0000 (23:38 -0500)
commit51d401adc51074e9bfce0269d0be46bc4e295b59
treecb3e465e954577cddf68c34e0dc77afcd603ef40
parent73420c24c626a957050d1537a8aed0b8114386a0
parent5a2ffaca16cd31db7fd4ba8ed709aeff75ef8b42
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info