Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 7 Sep 2010 20:00:59 +0000 (16:00 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 7 Sep 2010 20:00:59 +0000 (16:00 -0400)
commit75cbdab57e524075f0ccc51d103bf63beef62109
tree6d44ceedd0ded53e130674f21cdbc3eabeab0c3f
parent3c16ca60794df8196e05cb45a31f8b8f36b4a613
parent5f101ab1209e36c6e1a415a2e17677224025077c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info