Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 9 Jun 2010 19:32:20 +0000 (15:32 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Jun 2010 19:32:20 +0000 (15:32 -0400)
commit2eefd84d0adbcaaaf4aa1c306a1c745fa52f3c9b
tree73561cfd54ee8598e159925639db626947d73775
parentb5978713f134f82ba4929df234a16c007d4acb79
parent0b3d08665bf451d30bd9f355cfe31ed4072b407a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info