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)
Conflicts:
doc/todo/outbound_proxy.mdwn
doc/users/schmonz.mdwn


Trivial merge