Merge branch '1.6.x' of github.com:buildout/buildout into 1.6.x

Conflicts: CHANGES.txt

Merge branch '1.6.x' of github.com:buildout/buildout into 1.6.x
Conflicts: CHANGES.txt
ef8c5e2a · Adam Groszer · 8193f28c · 29af717c · ef8c5e2a
Commit ef8c5e2a authored Aug 24, 2012 by Adam Groszer
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

CHANGES.txt CHANGES.txt +7 -1

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,8 +6,14 @@ Change History

 - Windows fix: `buildout init` was broken, re.sub does not like a single backslash

+- fixed all builds on travis-ci
+  [Domen Kožar]
+
+- use os._exit insted of sys.exit after ugrade forking
+  [Domen Kožar]
+
 - Revert cfa0478937d16769c268bf51e60e69cd3ead50f3, it only broke a feature
-  (Domen Kožar)
+  [Domen Kožar]

 1.6.3 (2012-08-22)
 ==================