Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 7 Aug 2011 15:02:23 +0000 (11:02 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 7 Aug 2011 15:02:23 +0000 (11:02 -0400)
commit50b38aa476aab2f5ba8e75bc23abc137abb71823
treeca6991081a3919270ee9879402d9d30d038ea1aa
parent18730954841ce6aecdbcf08f232960e19708f753
parent79549ee8089ba9d4c981da73be1a71ecb066b5f7
Merge branch 'master' of ssh://git.ikiwiki.info