Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 7 Jul 2010 17:58:19 +0000 (13:58 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 7 Jul 2010 17:58:19 +0000 (13:58 -0400)
commit8ce11b51f85a08e6dd426b3855b06e5e3ce09f55
treed7de4772afc74010158f3974a7b881907d222039
parentb1f7aac8ec81490415d487b7db09d03675a7890b
parentc34e4823268183eac476072a8aa87a2756529a29
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info