From f2ccf073bd81e55f1e5ab563c466d0f7dc1beb5a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 30 Sep 2015 23:43:32 +0200
Subject: [PATCH] version bump and changelog

---
 CHANGELOG.md | 5 +++++
 build.gradle | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 938f91998..61d18a86a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 1.6.11
+* tab completion for MUC nicks
+* history export
+* bug fixes
+
 ####Version 1.6.10
 * fixed facebook login
 * fixed bug with ejabberd mam
diff --git a/build.gradle b/build.gradle
index cc95072c0..1c4d63b6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,8 +48,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 21
-		versionCode 96
-		versionName "1.6.10"
+		versionCode 97
+		versionName "1.6.11"
 		project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
 	}