From 465bd1f3e8d458ee209e858cad0639bf08ecf01d Mon Sep 17 00:00:00 2001
From: "Yamashita, Yuu" <peek824545201@gmail.com>
Date: Tue, 24 Nov 2015 01:08:46 +0000
Subject: [PATCH] v20151124

---
 CHANGELOG.md            | 9 +++++++++
 libexec/pyenv---version | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 563fcc43..87db0867 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## Version History
 
+### 20151124
+
+* pyenv: Import recent changes from rbenv 5fb9c84e14c8123b2591d22e248f045c7f8d8a2c
+* pyenv: List anaconda-style virtual environments as a version in pyenv (#471)
+* python-build: Import recent changes from ruby-build v20151028
+* python-build: Add PyPy 4.0.1 (#489)
+* python-build: Add `miniconda*-3.18.3` (#477)
+* python-build: Add CPython 2.7.11 RC1
+
 ### 20151105
 
 * python-build: Add anaconda2-2.4.0 and anacondaa3-2.4.0
diff --git a/libexec/pyenv---version b/libexec/pyenv---version
index 8544560b..f0d1453c 100755
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="20151105"
+version="20151124"
 git_revision=""
 
 for source_dir in "${BASH_SOURCE%/*}" "$PYENV_ROOT"; do