Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 30 May 2008 00:47:57 +0000 (20:47 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 30 May 2008 00:47:57 +0000 (20:47 -0400)
commit3a23cdde7d5621bc8d723d2226945ee5243115f3
treea40ba2f133270b823a3f6fbd0b5be52dafa55817
parent9d93029f010c5eaa73ecbce8eb887d9132b7311a
parent62e1c9238a1fe3f964f6cfe3a345647141b7d050
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info