buildout/buildout — pull request #213 by reinout (2014-11-24 14:33:47+00:00)
Title: Our VersionConflict handling could result in an UnpackError when rendering

See #212

Fixes #212

Includes test (that indeed failed initially). Includes fix (of course) and a changelog entry (hurray!).