Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 1 Sep 2009 17:04:52 +0000 (13:04 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 1 Sep 2009 17:04:52 +0000 (13:04 -0400)
commitacd4adbbccb15598b4603498c023d2fa04c0979c
tree8c8c501452971e315f42459eeb489b0d3fd5884f
parentccb1239d88803e07c590d2a69a0a26977d9c1bc8
parent86ddfb9b8f24bba9e2d98ccf4fbc9aad268eda03
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info