Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 16 Aug 2009 17:48:33 +0000 (13:48 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 16 Aug 2009 17:48:33 +0000 (13:48 -0400)
commitd6d1d944964efe6ede8e0dedd953cdcdbfc53111
tree343d7d39f2e9838de694ae61a0bc7076f191d1a9
parente8fd8583408a12d670b370716f4b7627a49533e0
parentb5576b556027e8f9b9ad52e02b383b8644adfb33
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info