Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:10:08 +0000 (15:10 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:10:08 +0000 (15:10 -0500)
commit1d9a41eecbf7029698aa11b680919864707583ed
tree45834ff5bfdff3efba1d13faaa978028ebd7c1a9
parentba1565acc1c92ce409aa341cd14102675f222183
parentb4d1a4bb9906c41da4174356708e157683f0bdd9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info