Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 30 May 2008 16:51:11 +0000 (12:51 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 30 May 2008 16:51:11 +0000 (12:51 -0400)
commit4a3dc37eafeb45b82c0452cca8a1328e974a583c
tree3c3c8f4e0153ca05916ccb36f54552a5c7d91af4
parent3a23cdde7d5621bc8d723d2226945ee5243115f3
parenta8890f510ebba6808c28c343a941a7ad0e49cbc4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info