From 5d7597438b2becc02fc90b964d88c2eae6de0304 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 29 Nov 2014 17:54:39 +0100
Subject: [PATCH] version bump to 0.9

---
 CHANGELOG.md | 9 +++++++++
 build.gradle | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db4f687bf..8f3b95729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ###Changelog
 
+####Version 0.9
+* arbitrary file transfer
+* more options to verify OTR (SMP, QR Codes, NFC)
+* ability to create instant conferences
+* r/o dynamic tags (presence and roster groups)
+* optional foreground service (expert option)
+* added SCRAM-SHA1 login method
+* bug fixes
+
 ####Version 0.8.4
 * bug fixes
 
diff --git a/build.gradle b/build.gradle
index 876cdf0aa..1c46f03d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ android {
 		minSdkVersion 14
 		targetSdkVersion 19
 		versionCode 37
-		versionName "0.9-alpha"
+		versionName "0.9"
 	}
 
 	compileOptions {