Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 16:59:57 +0000 (12:59 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 26 Mar 2010 16:59:57 +0000 (12:59 -0400)
commitb10c6dd631496df972177d8673d40d77bb441644
tree73a7b9f2985606985082f2e63a94bbd3dc1c3378
parent0dec80ee0cb9a2ac9dd4287645d02e5a216f2d0b
parent3c98cf653f6d6950a425620acf0279df902d004b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info