Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 04:33:32 +0000 (00:33 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 11 Jul 2009 04:33:32 +0000 (00:33 -0400)
commitd5be42a0910a1f0b0f6a9796fdbb43d1f02284f2
tree67fa77cd43d09b871f69477af4ffc8f3c0103842
parentb1b7a2100f6b32ef6bf75e9992e10ed7d28f8525
parenta13038458fc5712ec651f8afb6a58fe3c4fb21f8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info