Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 27 Sep 2008 16:49:10 +0000 (12:49 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 27 Sep 2008 16:49:10 +0000 (12:49 -0400)
commitc84c7d6ea7517a7c78c487d604f5a4db4693a446
treed00c5973dce6c7ce87933fd7d80d33ee400cfb00
parent748fc2fcd4997d5eca75241d157b4dcaff2a6cdb
parentf9a000b24bdccc4b047856e4fedfa9cba871ed14
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info