From: Joey Hess <joey@kitenet.net>
Date: Sat, 3 Aug 2013 14:03:31 +0000 (-0400)
Subject: Merge remote-tracking branch 'schmonz/proxy'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/cbde8520e9cc5512bd2726e2fa26089db0ddc7ab

Merge remote-tracking branch 'schmonz/proxy'

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

cbde8520e9cc5512bd2726e2fa26089db0ddc7ab