Daniel Hahler 03ece82197 Merge remote-tracking branch 'rbenv/master' ... Using `git merge rbenv/master -s recursive -X rename-threshold=5%`. Conflicts: README.md bin/python-local-exec libexec/pyenv libexec/pyenv-help test/--version.bats		2015-12-14 13:47:11 +01:00
..
pyenv	Merge remote-tracking branch 'rbenv/master'	2015-12-14 13:47:11 +01:00
pyenv---version
pyenv-commands
pyenv-completions
pyenv-exec
pyenv-global
pyenv-help
pyenv-hooks
pyenv-init
pyenv-local
pyenv-prefix
pyenv-rehash
pyenv-root
pyenv-sh-rehash
pyenv-sh-shell
pyenv-shims
pyenv-version
pyenv-version-file
pyenv-version-file-read
pyenv-version-file-write
pyenv-version-name
pyenv-version-origin
pyenv-versions
pyenv-whence
pyenv-which	Merge remote-tracking branch 'rbenv/master'	2015-12-14 13:47:11 +01:00