Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jan 2008 01:12:41 +0000 (20:12 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jan 2008 01:12:41 +0000 (20:12 -0500)
commitee9eb63599837db02df9cc826d10bef977126a81
tree50fdb2608db90f1fe0b46b6266371aca670eb69f
parent8a021b3bdb0a9a05c2119e9238f15641db7d7bd1
parentcc1eafcf188d12c7d0f636b0c00995b0fa44f958
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info