Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 10 Aug 2009 20:05:50 +0000 (16:05 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 10 Aug 2009 20:05:50 +0000 (16:05 -0400)
commit7712bb662aa98bc84cf1676500cdfef5d677d704
tree18dcd8586e482d27772fe6cab779cb379979ed32
parent83480665c256a344900fc817bcb4618f8db9aeee
parentaf29201c3ce1099fbc3f8e6986d098fac6cef249
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info