Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 25 Feb 2011 18:56:16 +0000 (14:56 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 25 Feb 2011 18:56:16 +0000 (14:56 -0400)
commitcc5f8de9e89c0028c94974a6b81f17f0628e9888
tree69e35c308e77fa97334a3a338b469d5bdb725e66
parent5d6a455367d563881f87b8157294565aaf20109c
parent93f963abd05900306823dc165baa339b8c5106b1
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info