Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 21 May 2009 19:56:51 +0000 (15:56 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 21 May 2009 19:56:51 +0000 (15:56 -0400)
commit6278aa49f95e8a62d18ceba3d386c99a4bff2ab3
treed4b6679f997a311af7cf46c8293ee8d4d9c5fb0d
parentaefbe930bba9a611f9c72a3170002f90cfc3e1dc
parente7bad274894fec38e03f99f54aa73586729e6798
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info