Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 6 May 2009 17:07:06 +0000 (13:07 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 6 May 2009 17:07:06 +0000 (13:07 -0400)
commit3c66e1552b70fe5ed5211aafcf127c647d79b481
tree71e89220748a0f909670702aa8be05ca78ed6749
parentd3188a04fff1d0ed7329b3aae8343beaf1735390
parent6f991c7a1c2441b5110e2d895a12a73c63895b44
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info