Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 13 Sep 2010 16:49:55 +0000 (12:49 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 13 Sep 2010 16:49:55 +0000 (12:49 -0400)
commit96d41dd21641c7a2683bdd0671bcd36dab7c069c
tree49e963a53ef734d203b5bfd466535539d45f2b5a
parent24ff4a9e5f365854ebef59ca2ef99552fdc5b4a6
parent0586d52f1f8978e53e90df32a21ebd346eabaa1b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info