Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 23 Jul 2010 18:15:18 +0000 (14:15 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 23 Jul 2010 18:15:18 +0000 (14:15 -0400)
commit87d4ef453c77994abefa55b16ba4c1f52524571f
treedaa3e96f7d39c7693e6119ab9602faef9535c508
parent1b0bef6d49722d37eca3e871e808e46b2a1461a3
parent081b43a8aec8c49fca0ffa4e4b72d41869050e89
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info