Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 14 May 2010 02:33:01 +0000 (22:33 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 14 May 2010 02:33:01 +0000 (22:33 -0400)
commitab3efb21d9f3c43cf01e5d1be5a55cf7a233adfb
treed3229b117cf27affd2bbe8f014c4789e7fda79c5
parent031da9c134fca2c6d689f343ac0b4a537b4cfd15
parent50c9851ddc834f6261da0df525374efd867f731d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info