Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Jan 2009 17:29:18 +0000 (12:29 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 7 Jan 2009 17:29:18 +0000 (12:29 -0500)
commitf01a5c9df70ad1e001685dc24b8d2cd2df0d05af
tree79f9da1ec448d3d5316b463619971bfb59e2617d
parent551544663db939c8eb32dd78ad74e1514589be25
parent29c05eaff8155b1937c90f05a6ab0b881a136488
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info