Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 21 Aug 2009 19:58:56 +0000 (15:58 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 21 Aug 2009 19:58:56 +0000 (15:58 -0400)
commit75f764cfce3262f12f86b82515a98ad24a49ff09
treeaea61811427026c0388d5674bd45ad1ed6eaa323
parentdf9d39698f93d803acdf37d1c94f74f58719634e
parent24d43bea075354ecd8546131529a064140b9039c
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info