Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 18 Dec 2008 23:00:03 +0000 (18:00 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 18 Dec 2008 23:00:03 +0000 (18:00 -0500)
commit7fc83fbd15164691988d9a0f8043b2b727a20f7f
treeddc27a25c44947ccda5629e408ff0566940c5f67
parent65c4ae1ac1f9569052b96452d3df0e73c8b5b2f3
parenta115ff254dd97a182b8ca21609e8453a514c3d25
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info