]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 20 Jun 2008 23:41:24 +0000 (19:41 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 20 Jun 2008 23:41:24 +0000 (19:41 -0400)
commitdab86121b22bb9092f4a5efcc1e70c521a083b37
tree577fdb572abecd65592437dce0f9194063505092
parentc4c31ea48f9118fd0ea29c40074a3e911c63b145
parentd9a0af0dd2929f5881f9273e784769474557361e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info