Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 20 Jun 2008 02:38:17 +0000 (22:38 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 20 Jun 2008 02:38:17 +0000 (22:38 -0400)
commitc4c31ea48f9118fd0ea29c40074a3e911c63b145
tree2006c17c2e28994f3e9a81dc4ff75b79e8edbdcb
parent1b6b4da3a3fd34b7ac9bf3d7e7928af4bc35b81f
parent6d402b5a9ae7a46504015ca58ff8f8f2761e8062
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info