Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 9 Aug 2010 17:19:17 +0000 (13:19 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 9 Aug 2010 17:19:17 +0000 (13:19 -0400)
commit292e820974fd308148841b1714967619d4acba59
tree9bd6ccf58529b82dfe6c91c5148b647c33cc534b
parent51d5e546974405741e08ed27d0bf89958fa7366b
parentd2b50c37b44972e60d08854e9e780a09481872d5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info