master updated (64d2e5a -> 71209b2)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  64d2e5a   Revert previous hideshow commit
       new  764bad7   Make shadowing warning in describe_map less confusing
       new  71209b2   Tweak how "u" works in Info buffers when 
scroll-conservatively is set


Summary of changes:
 lisp/info.el | 6 +++++-
 src/keymap.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)