Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:19:54 +0000 (16:19 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 4 Oct 2009 20:19:54 +0000 (16:19 -0400)
commitcda8592a5fd5595d12f0503bfcd2e0640e0afc86
tree514cd7e4c5799144983d3663283c422b1c287569
parent6f1ebdd6922a2c96fd57c71cd2052992d13f9c22
parent7b692b5d6ec2c1cf86b627c4e3ed7a5d0a751580
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info