Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 21 Oct 2009 17:51:01 +0000 (13:51 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 21 Oct 2009 17:51:01 +0000 (13:51 -0400)
commitba682e0f9a55ffd74584aa3b8abb0087c7762317
tree753babaf34341acb80e6a4a5c181aac2593ea9e9
parent587e0c3d21dfbde052e0fd71a7ed0e33e09e757f
parentb69f9eba9250b5c71e81415c977836d4421ef0a4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info