From 3a1bd7c4e658c514f5ee47ecdd815ac832bfc462 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 3 Oct 2013 19:01:58 +0200
Subject: [PATCH 1/2] Remove duplicate allow_muc and sort

---
 converse.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/converse.js b/converse.js
index e225e387b..00e55ca3e 100644
--- a/converse.js
+++ b/converse.js
@@ -70,20 +70,19 @@
             'auto_list_rooms',
             'auto_subscribe',
             'bosh_service_url',
-            'fullname',
+            'connection',
             'debug',
+            'fullname',
             'hide_muc_server',
             'i18n',
-            'allow_muc',
-            'prebind',
-            'show_controlbox_by_default',
-            'xhr_user_search',
-            'xhr_custom_status',
-            'connection',
-            'testing',
             'jid',
+            'prebind',
+            'rid',
+            'show_controlbox_by_default',
             'sid',
-            'rid'
+            'testing',
+            'xhr_custom_status',
+            'xhr_user_search'
         ];
         _.extend(this, _.pick(settings, whitelist));
 

From feb87bc88b6d271b6fcb4e4e277db103cb3f6d7a Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 4 Oct 2013 09:03:50 +0200
Subject: [PATCH 2/2] Mention new languages

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 6a4dc297f..bca0cdcea 100644
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ It has the following features:
 * Custom status messages
 * Typing notifications
 * Third person messages (/me )
-* Translated into multiple languages  (af, de, es, it, pt_BR)
+* Translated into multiple languages  (af, de, es, fr, it, hu, pt-BR, ru)
 
 -----------
 Screencasts