Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 29 Sep 2010 16:00:34 +0000 (12:00 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 29 Sep 2010 16:00:34 +0000 (12:00 -0400)
commite65ce4f0937eaf622846c02a9d39fa7aebe4af12
tree47992a97f57f304b10308956d41b8b7cd6eabe55
parent2df92a956af2ed6b4ac3c2c3de01c56bb08e2368
parentb0483974f5f71bc75f5a4df3e636af246371cbf6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info