merged the proxy branch into master!

diff --git a/doc/todo/git-annex_proxies.mdwn b/doc/todo/git-annex_proxies.mdwn
index de0c11d161908e6082f6b15ffddbd2cfbc5b9946..73538cec422d3d1f087e83ab3a446a904647825f 100644 (file)
--- a/doc/todo/git-annex_proxies.mdwn
+++ b/doc/todo/git-annex_proxies.mdwn
@@ -22,8 +22,6 @@ Planned schedule of work:
 
 # work notes
 
-In development on the `proxy` branch.
-
 For June's work on [[design/passthrough_proxy]], remaining todos:
 
 * Since proxying to special remotes is not supported yet, and won't be for