Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 21 Mar 2011 17:47:12 +0000 (13:47 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 21 Mar 2011 17:47:12 +0000 (13:47 -0400)
commit14b8abe60f02a9a31eb4b7ad489e6806637610f7
treea260f52b60d453c2bc244e5e126522c2dc9e5628
parente96ecf2f9317b0f7d547e86bcaf67b3aebecd8ea
parent7be18bf29a26a40a9c401fb4f5ce8c2ef3e33ffb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info