Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 31 Mar 2009 18:16:56 +0000 (14:16 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 31 Mar 2009 18:16:56 +0000 (14:16 -0400)
commita82ddbe6d95b85bf1c4a96e1162540689d0d786d
tree48ff549a1190bcfc8f3e182b2c9eee230f83fbb5
parentb1f9996078314bd1b05e66e2962fb067754a36be
parenta1fa2492879630efc4416be8ceae94ecf73b8647
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info