Merge branch 'master' into exportreeplus

doc/todo/exporttree_remotes_could_store_any_key.mdwn

@@ -77,3 +77,7 @@ exporttree=yes special remote R.
 So, when calling removeExport, have to also check if the key is present in
 the objects location. If so, either don't record the key as missing, or
 also remove from the objects location.
+
+---
+
+Implementing in the "exportreeplus" branch --[[Joey]]

doc/todo/git-annex_proxies.mdwn

@@ -30,7 +30,8 @@ Planned schedule of work:
 
 ## work notes
 
-* release time
+* Working on `exportreeplus` branch which is groundwork for proxying to
+  exporttree=yes special remotes.
 
 ## items deferred until later for p2p protocol over http