Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 3 May 2010 20:03:06 +0000 (16:03 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 3 May 2010 20:03:06 +0000 (16:03 -0400)
commitae75c9bee683d5645b033ddea5b211cc99416d19
tree686ce409eb71ed94c1efe9a5f1f7ae2bc09af6a0
parent9699f16b5186237ca98ebfc90a8644b672485245
parent4733a1a9cd2182bf052ba8545e3a61242f8b94a9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info