Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 2 Oct 2010 16:03:04 +0000 (12:03 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 2 Oct 2010 16:03:04 +0000 (12:03 -0400)
commit83bfeb959ea218efa9b3e0601486fd0298cb6623
tree04633d99c0c5aecbd2d0aa0c16ce4511e99eb149
parentbd48ff734a0e01a6f2c097932f728ccb680702a2
parent43cdf3f22fdc22e0b93e245f68b330b50d4fb292
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info