Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:03:30 +0000 (13:03 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:03:30 +0000 (13:03 -0400)
commitec2790b0ec152afc2dc8a29ce89f9b140a1e7647
tree38363a33d5fe0e9e243f75305725c068cc7bb3ea
parentc2c57f0cfba182964359f0ee71f84fb1b935d10f
parentf9553a06ab0a13140c62a90a59c566faeedfa9d6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info