Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Jan 2009 21:09:12 +0000 (16:09 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Jan 2009 21:09:12 +0000 (16:09 -0500)
commit16a320b69f0e9fb82312c30b8b858b9efe48ceed
tree27b9b27db349f2be8654df1cdca7146d901fe180
parent81b088866be5f55433c12e09c90e2ae404a8ed89
parent11bac17272646a98fd233864e697f34ce47a7d79
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info