Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 15 May 2008 22:04:29 +0000 (18:04 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 15 May 2008 22:04:29 +0000 (18:04 -0400)
commitc7b1eb242fc5b910f138aeadbae7a232badba84f
tree7b68bde5d093ffef841a663beebd1fb6bbb090fb
parent0bf52484278b5afbc910a57d4842ed69f7c88222
parent9ddb0407d25452a94bfb65680ad89508e3bce90f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info