Merge branch 'release-0.6.0' into develop

2 files changed, 17 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 35ad2918..caf1fe5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+0.6.0 August 18 2014 - the "persistent" release
+Features
+- Improved security:
+  - traffic always routed by VPN after you've established a connection
+  - Avoid a common security attack (a Mitm - man in the middle)
+- Clearer setup dialog: you can also sign up from the log in dialog
+- Faster autostart: Bitmask starts sooner during your phone boot process
+- Prompt to log in if you start a register only EIP provider
+
+Bugs Fixed
+- Removed second notification!
+- VPN switch more consistent with the real state
+- Changed orientation? No problem.
+- Reported bugs from Google Play fixed.
+
 0.5.4 July 21 2014 - the "meetup" release
 Features
 - Renewal of the certificate soon enough
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a30211a4..507e5bb0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="86"
-    android:versionName="0.5.4" >
+    android:versionCode="90"
+    android:versionName="0.6.0" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />