Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 22:46:10 +0000 (18:46 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 2 Oct 2009 22:46:10 +0000 (18:46 -0400)
commit82ae1372a451781097086c8041288caca16a8296
treef2cc473249b9e0d21ca0eb3079ba86b6019b2bf3
parent7ef22f25969741fb7aed9be650dd026dd6dddcc9
parent06a1ad7e760258eb0689e327825c15e2aa5234b2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info