From d58d822215708cc0d9c841872abab448bf290e4c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 11 Feb 2016 17:13:17 +0100
Subject: [PATCH] version bump to 1.9.4 + changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0407f2d43..fe593143b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 1.9.4
+* prevent cleared Conversations from reloading history with MAM
+* various MAM fixes
+
 ####Version 1.9.3
 * expert setting that enables host and port configuration
 * expert setting opt-out of bookmark autojoin handling
diff --git a/build.gradle b/build.gradle
index 9722b3e27..85be33055 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,8 +53,8 @@ android {
 	defaultConfig {
 		minSdkVersion 14
 		targetSdkVersion 23
-		versionCode 122
-		versionName "1.9.3"
+		versionCode 123
+		versionName "1.9.4"
 		project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
 	}