Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 4 Feb 2010 20:07:30 +0000 (15:07 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 4 Feb 2010 20:07:30 +0000 (15:07 -0500)
commitc6538d56f0cb705fbbd2591de4a726e174ed025b
tree9ae1a5f0672a3309c0e7ea8eafbe3f0882cc25be
parentb547170a965e93a759de1612d4ce64d38eeea59c
parent208335ec80f4678ea352823111b953f1d7eccff9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info