From e89e54a04a3569ed8361897e82cf6d522ef51f69 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 19:11:27 +0100
Subject: [PATCH] version bump to 0.10

---
 CHANGELOG.md                                           | 10 ++++++++++
 build.gradle                                           |  4 ++--
 .../conversations/generator/AbstractGenerator.java     |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39e44fbe1..84eb5ee0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,14 @@
 ###Changelog
+####Version 0.10
+* Support for Message Archive Management
+* Dynamically load message history
+* Ability to block contacts
+* New UI to verify fingerprints
+* Ability to change password on server
+* removed stream compression
+* quiet hours
+* fixed connection issues on ipv6 servers
+
 ####Version 0.9.3
 * bug fixes
 
diff --git a/build.gradle b/build.gradle
index e7cb10979..29cb3840e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,8 +46,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 19
-		versionCode 40
-		versionName "0.9.3"
+		versionCode 41
+		versionName "0.10"
 	}
 
 	compileOptions {
diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index b200b2a11..870ee7572 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -23,7 +23,7 @@ public abstract class AbstractGenerator {
 			"http://jabber.org/protocol/disco#info",
 			"urn:xmpp:avatar:metadata+notify",
 			"urn:xmpp:ping"};
-	public final String IDENTITY_NAME = "Conversations 0.9.3";
+	public final String IDENTITY_NAME = "Conversations 0.10";
 	public final String IDENTITY_TYPE = "phone";
 
 	private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);