Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 5 Dec 2010 20:38:44 +0000 (16:38 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 5 Dec 2010 20:38:44 +0000 (16:38 -0400)
commit38d7e71c654f27cd2691537742e84b8113f1ad3c
treeb83d7abc0677255455d3ad3f9431a97ea42b05d2
parentefe702479afc51b8364c58d9a2ed86ad1780b5ae
parentabd4ec558efc12efe4286237d6a2f22f15e79ad4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info