Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 22 Nov 2009 20:08:29 +0000 (15:08 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 22 Nov 2009 20:08:29 +0000 (15:08 -0500)
commitaeaaeecd515748dfc044a5a5853426a35de70c94
treee38b1044d126a0eb1bc1e0795f702a771a3cdb3d
parent6fe2ec0f5c3d9fe5780385c17aaf7370fe8efc24
parentff5ae256b9dd0554a881388d88788366049babf1
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info