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	v20151210	2015-12-10 08:27:05 +00:00
pyenv-commands
pyenv-completions	Merge remote-tracking branch 'rbenv/master' into rbenv-20151121	2015-11-21 04:21:14 +00:00
pyenv-exec
pyenv-global
pyenv-help	Merge remote-tracking branch 'rbenv/master' into rbenv-20151121	2015-11-21 04:21:14 +00:00
pyenv-hooks	Merge remote-tracking branch 'rbenv/master' into rbenv-20151121	2015-11-21 04:21:14 +00:00
pyenv-init	Merge remote-tracking branch 'rbenv/master' into rbenv-20151121	2015-11-21 04:21:14 +00:00
pyenv-local
pyenv-prefix
pyenv-rehash	Merge remote-tracking branch 'rbenv/master' into rbenv-20151121	2015-11-21 04:21:14 +00:00
pyenv-root
pyenv-sh-rehash
pyenv-sh-shell
pyenv-shims
pyenv-version
pyenv-version-file	Merge remote-tracking branch 'rbenv/master' into rbenv-20151121	2015-11-21 04:21:14 +00:00
pyenv-version-file-read
pyenv-version-file-write
pyenv-version-name	Merge remote-tracking branch 'rbenv/master' into rbenv-20151121	2015-11-21 04:21:14 +00:00
pyenv-version-origin
pyenv-versions	Skip virtualenv aliases as well (yyuu/pyenv-virtualenv#126)	2015-12-02 09:52:33 +00:00
pyenv-whence
pyenv-which	Merge remote-tracking branch 'rbenv/master'	2015-12-14 13:47:11 +01:00