Merge branch 'mm/include-userpath'

The new "include.path" directive in the configuration files learned
to understand "~/path" and "~user/path".

By Jeff King
* mm/include-userpath:
config: expand tildes in include.path variable

diff --cc Documentation/config.txt
Simple merge