Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 23 Nov 2009 20:01:23 +0000 (15:01 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 23 Nov 2009 20:01:23 +0000 (15:01 -0500)
commit4c0c6a19b83459d0336bafecc0e6181729a7b729
tree14af1eaed9685f8a66fc4c2e594179232bf78ccb
parentcf6fd45a8a6379232c3c8dec652175c42a96040b
parent2a933a07c63056df0a645c501e16a951c7308184
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:
doc/sandbox.mdwn