Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 15 Sep 2010 19:38:24 +0000 (15:38 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 15 Sep 2010 19:38:24 +0000 (15:38 -0400)
commit0e89f374a6728e76b512d00224eb9a9455ed7939
tree8366a5bffc1691e073f4eb59954f43aaa0536d7c
parent78e89acf370cd456b64a163cc1963362c14ebe28
parent852cc25f3b5d0f7b026e37a6231334edc92d367f
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info