Merge branch '2.x'

Marcus Linke · Marcus Linke · commit c1af594836d3 · 2015-12-08T20:29:02.000+01:00
Conflicts:
	CHANGELOG.md
	pom.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@ All changes
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
-2.1.3-SNAPSHOT
+v2.1.3
 ---
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
 * [#386] (https://github.com/docker-java/docker-java/pull/386) Basic http proxy configuration support
