Merge branch 'jk/maint-stash-oob' into maint

diff --git a/vcs-svn/trp.txt b/vcs-svn/trp.txt
index 5ca6b42edb289c5f5714ae2f0a09710d40dd14f3..177ebca335a7ad348a56b12bc1e01fd9c2076e0e 100644 (file)
--- a/vcs-svn/trp.txt
+++ b/vcs-svn/trp.txt
@@ -96,7 +96,7 @@ node_type *foo_search(struct trp_root \*treap, node_type \*key)::
 
 node_type *foo_nsearch(struct trp_root \*treap, node_type \*key)::
 
-       Like `foo_search`, but if if the key is missing return what
+       Like `foo_search`, but if the key is missing return what
        would be key's successor, were key in treap (NULL if no
        successor).