Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 23 Nov 2011 20:55:20 +0000 (16:55 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 23 Nov 2011 20:55:20 +0000 (16:55 -0400)
commit4580662795788b83107d20943c77c7d4a6136a0a
tree71151510670fcb788a04684772a9ab0ed054167d
parent239e609bcf4e4c85fa505775e16ef4cb07655759
parentd6011a150003aa336072a59ff1209a929718ce83
Merge branch 'master' of ssh://git.ikiwiki.info
doc/bugs/Running_on_an_alternative_port_fails.mdwn