Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 27 Jun 2010 17:50:02 +0000 (13:50 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 27 Jun 2010 17:50:02 +0000 (13:50 -0400)
commitbe60d261e6cbee094e4df74e1bb24c8ad3dc393d
tree23d6f355734a34a0d56e14ebd27f883b93423880
parentbb5193fde1dbe5ebffe84deddc6ed4aac80a36b0
parent6e68a48b63a532369d97709dd189d233c5fd0298
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info