From 34dafc24af0e6e3d16a6169fd6e981e4535c23be Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 21 Jul 2014 20:30:51 +0200
Subject: [PATCH] version bump to 0.5-beta and changelog

---
 AndroidManifest.xml | 6 +++---
 CHANGELOG.md        | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c04bb82b0c4c6bd3f6d0cb1b71fcdd639ec5ee67..a755c98a2fa1654bbdb2179a6e06b1394d6adc7a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.siacs.conversations"
-    android:versionCode="19"
-    android:versionName="0.4.1" >
+    android:versionCode="20"
+    android:versionName="0.5-beta" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -107,4 +107,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a7d9c63adba7d285d5b7b253c8706ab2e7b06b9..433b580f84129ecfc66bf70c76d26a484538bacc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 0.5
+* UI overhaul
+* MUC / Conference bookmarks
+* A lot of bug fixes
+
 ####Version 0.4
 * OTR file encryption
 * keep OTR messages and files on device until both parties or online at the same time