Merge release 0.6.1 back to master

Conflicts: VERSION
2013-08-23 22:59:29 +00:00 · 2013-08-23 22:59:29 +00:00 · 99a8306898
commit 99a8306898
parent dcfb993ac7 bd16107e97
2 changed files with 7 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,11 @@
 # Changelog

+## 0.6.1 (2013-08-23)
+* Registry: Pass "meta" headers in API calls to the registry
+- Packaging: Use correct upstart script with new build tool
+- Packaging: Use libffi-dev, don't build it from sources
+- Packaging: Removed duplicate mercurial install command
+
 ## 0.6.0 (2013-08-22)
 - Runtime: Load authConfig only when needed and fix useless WARNING
 + Runtime: Add lxc-conf flag to allow custom lxc options
--- a/2
+++ b/2
@ -1 +1 @@
-0.6.0-dev
+0.6.1-dev