]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge remote-tracking branch 'schmonz/proxy'
authorJoey Hess <joey@kitenet.net>
Sat, 3 Aug 2013 14:03:31 +0000 (10:03 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 3 Aug 2013 14:03:31 +0000 (10:03 -0400)
commitcbde8520e9cc5512bd2726e2fa26089db0ddc7ab
treec60255d0f633877a444050f53f8178fd327d4b55
parentb785d135402611b66b6df7ca561f5a4152ab5dee
parentd844a3487ed03fc35eecd89c6924c5e5ad36b4c5
Merge remote-tracking branch 'schmonz/proxy'

Conflicts:
doc/todo/outbound_proxy.mdwn
doc/users/schmonz.mdwn