Updated changelog for last merged pull request

b84e20d6 · Reinout van Rees · 2c165194 · b84e20d6
Commit b84e20d6 authored Jun 10, 2015 by Reinout van Rees
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

CHANGES.rst CHANGES.rst +4 -0

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -17,6 +17,10 @@ Unreleased
  conflict message.
  [reinout]

+- Making sure we use the correct easy_install when setuptools is installed
+  globally. See https://github.com/buildout/buildout/pull/232
+  [lrowe]
+

 2.3.1 (2014-12-16)
 ==================