From 92852652c56d96e69709b2916917124548c3cb59 Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Wed, 3 Apr 2013 00:46:40 +0530
Subject: [PATCH] Updated CHANGELOG and bumped version number

---
 CHANGELOG.md                | 6 ++++++
 commons/AndroidManifest.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6792eef18..cd4c7583a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Wikimedia Commons for Android
 
+## v1.0 beta 6
+- Add categorization
+- Add a 'Modifications Sync' framework for doing eventual-consistent page edits
+- More consistent designb between single and multiple upload
+- i18n updates
+
 ## v1.0 beta 5.1
 - Emergency release, since beta5 uploaded to testwiki
 
diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml
index d47daa19e..612881600 100644
--- a/commons/AndroidManifest.xml
+++ b/commons/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.wikimedia.commons"
-    android:versionCode="6"
-    android:versionName="1.0beta5.1" >
+    android:versionCode="7"
+    android:versionName="1.0beta6" >
 
     <uses-sdk
         android:minSdkVersion="9"