Merge branch '0.6.x'

Conflicts:
	CHANGES.rst

CHANGES.rst

@@ -4,12 +4,12 @@ Changelog
 0.6.4 (2013-09-15)
 ------------------
 
-- Add icon for the unavailable chat state. [jcbrand]
-- Chat state descriptions weren't translation aware. [jcbrand]
-- Clear messages from localStorage when user types "/clear". [jcbrand]
-- The 'xa' chat state wasn't being handled properly. [jcbrand]
-- Updated pt-BR translations [seocam]
-- Updated af and de translations [jcbrand]
+* Add icon for the unavailable chat state. [jcbrand]
+* Chat state descriptions weren't translation aware. [jcbrand]
+* Clear messages from localStorage when user types "/clear". [jcbrand]
+* The 'xa' chat state wasn't being handled properly. [jcbrand]
+* Updated pt-BR translations [seocam]
+* Updated af and de translations [jcbrand]
 
 0.6.3 (2013-09-12)
 ------------------
@@ -17,100 +17,100 @@ Changelog
 NB: This release contains an important security fix. Please don't use older
 versions of the 0.6 branch.
 
-- French translations. [tdesvenain]
-- Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand]
+* French translations. [tdesvenain]
+* Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand]
 
 0.6.2 (2013-08-29)
 ------------------
 
-- Bugfix. The remove icon wasn't appearing in the contacts roster. [jcbrand]
-- Bugfix. With auto_subscribe=True, the "Pending Contacts" header didn't disappear
+* Bugfix. The remove icon wasn't appearing in the contacts roster. [jcbrand]
+* Bugfix. With auto_subscribe=True, the "Pending Contacts" header didn't disappear
 after a new user was accepted. [jcbrand]
 
 0.6.1 (2013-08-28)
 ------------------
 
-- IE9 and IE8 CSS fixes. [jcbrand]
-- Bugfix: Pencil icon not visible (for setting status update). [jcbrand]
-- Bugfix: RID, JID and SID initialization values were being ignored. [jcbrand]
-- Bugfix: Fall back to English if a non-existing locale was specified. [jcbrand]
+* IE9 and IE8 CSS fixes. [jcbrand]
+* Bugfix: Pencil icon not visible (for setting status update). [jcbrand]
+* Bugfix: RID, JID and SID initialization values were being ignored. [jcbrand]
+* Bugfix: Fall back to English if a non-existing locale was specified. [jcbrand]
 
 0.6.0 (2013-08-26)
 ------------------
 
-- #39 Documentation for minifying JS is wrong. [jcbrand]
-- #41 prebind and show_controlbox_by_default true fails. [jcbrand]
-- With prebinding, attaching to the connection now happens inside Converse and
+* #39 Documentation for minifying JS is wrong. [jcbrand]
+* #41 prebind and show_controlbox_by_default true fails. [jcbrand]
+* With prebinding, attaching to the connection now happens inside Converse and
   not as a separate step after initialization. [jcbrand]
-- Register presence and message handlers before fetching the roster. Otherwise
+* Register presence and message handlers before fetching the roster. Otherwise
   some presence notifications might be missed. [jcbrand]
-- Add a debug option (logs to the browser console). [jcbrand]
-- Use font icons from http://icomoon.io [jcbrand]
-- Added a static mockup to aid CSS/design process. [jcbrand]
-- Save language codes with hyphens. Thanks to @seocam. [jcbrand]
-- The combined and minified JS file now uses almond and not require.js. [jcbrand]
+* Add a debug option (logs to the browser console). [jcbrand]
+* Use font icons from http://icomoon.io [jcbrand]
+* Added a static mockup to aid CSS/design process. [jcbrand]
+* Save language codes with hyphens. Thanks to @seocam. [jcbrand]
+* The combined and minified JS file now uses almond and not require.js. [jcbrand]
 
 0.5.2 (2013-08-05)
 ------------------
 
-- Important security update. Don't expose the Strophe connection object globally. [jcbrand]
+* Important security update. Don't expose the Strophe connection object globally. [jcbrand]
 
 0.5.1 (2013-08-04)
 ------------------
 
-- #13, #14: Messages sent between to GTalk accounts weren't being received. [jcbrand]
-- #32: Default status was offline when user didn't have contacts. [jcbrand]
-- Attach panels to the DOM upon initialize. [jcbrand]
+* #13, #14: Messages sent between to GTalk accounts weren't being received. [jcbrand]
+* #32: Default status was offline when user didn't have contacts. [jcbrand]
+* Attach panels to the DOM upon initialize. [jcbrand]
 
 0.5.0 (2013-07-30)
 ------------------
 
-- #09 Remove dependency on AMD/require.js [jcbrand]
-- #22 Fixed compare operator in strophe.muc [sonata82]
-- #23 Add Italian translations [ctrlaltca]
-- #24 Add Spanish translations [macagua]
-- #25 Using span with css instead of img [matheus-morfi]
-- #26 Only the first minute digit shown in chatbox. [jcbrand]
-- #28 Add Brazilian Portuguese translations [matheus-morfi]
-- Use Bower to manage 3rd party dependencies. [jcbrand]
+* #09 Remove dependency on AMD/require.js [jcbrand]
+* #22 Fixed compare operator in strophe.muc [sonata82]
+* #23 Add Italian translations [ctrlaltca]
+* #24 Add Spanish translations [macagua]
+* #25 Using span with css instead of img [matheus-morfi]
+* #26 Only the first minute digit shown in chatbox. [jcbrand]
+* #28 Add Brazilian Portuguese translations [matheus-morfi]
+* Use Bower to manage 3rd party dependencies. [jcbrand]
 
 0.4.0 (2013-06-03)
 ------------------
 
-- CSS tweaks: fixed overflowing text in status message and chatrooms list. [jcbrand]
-- Bugfix: Couldn't join chatroom when clicking from a list of rooms. [jcbrand]
-- Add better support for kicking or banning users from chatrooms. [jcbrand]
-- Fixed alignment of chat messages in Firefox. [jcbrand]
-- More intelligent fetching of vCards. [jcbrand]
-- Fixed a race condition bug. Make sure that the roster is populated before sending initial presence. [jcbrand]
-- Reconnect automatically when the connection drops. [jcbrand]
-- Add support for internationalization. [jcbrand]
+* CSS tweaks: fixed overflowing text in status message and chatrooms list. [jcbrand]
+* Bugfix: Couldn't join chatroom when clicking from a list of rooms. [jcbrand]
+* Add better support for kicking or banning users from chatrooms. [jcbrand]
+* Fixed alignment of chat messages in Firefox. [jcbrand]
+* More intelligent fetching of vCards. [jcbrand]
+* Fixed a race condition bug. Make sure that the roster is populated before sending initial presence. [jcbrand]
+* Reconnect automatically when the connection drops. [jcbrand]
+* Add support for internationalization. [jcbrand]
 
 0.3.0 (2013-05-21)
 ------------------
 
-- Add vCard support [jcbrand]
-- Remember custom status messages upon reload. [jcbrand]
-- Remove jquery-ui dependency. [jcbrand]
-- Use backbone.localStorage to store the contacts roster, open chatboxes and chat messages. [jcbrand]
-- Fixed user status handling, which wasn't 100% according to the spec. [jcbrand]
-- Separate messages according to day in chats. [jcbrand]
-- Add support for specifying the BOSH bind URL as configuration setting. [jcbrand]
-- #8 Improve the message counter to only increment when the window is not focused [witekdev]
-- Make fetching of list of chatrooms on a server a configuration option. [jcbrand]
-- Use service discovery to show all available features on a room. [jcbrand]
-- Multi-user chatrooms are now configurable. [jcbrand]
+* Add vCard support [jcbrand]
+* Remember custom status messages upon reload. [jcbrand]
+* Remove jquery-ui dependency. [jcbrand]
+* Use backbone.localStorage to store the contacts roster, open chatboxes and chat messages. [jcbrand]
+* Fixed user status handling, which wasn't 100% according to the spec. [jcbrand]
+* Separate messages according to day in chats. [jcbrand]
+* Add support for specifying the BOSH bind URL as configuration setting. [jcbrand]
+* #8 Improve the message counter to only increment when the window is not focused [witekdev]
+* Make fetching of list of chatrooms on a server a configuration option. [jcbrand]
+* Use service discovery to show all available features on a room. [jcbrand]
+* Multi-user chatrooms are now configurable. [jcbrand]
 
 
 0.2.0 (2013-03-28)
 ------------------
 
-- Performance enhancements and general script cleanup [ichim-david]
-- Add "Connecting to chat..." info [alecghica]
-- Various smaller improvements and bugfixes [jcbrand]
+* Performance enhancements and general script cleanup [ichim-david]
+* Add "Connecting to chat..." info [alecghica]
+* Various smaller improvements and bugfixes [jcbrand]
 
 
 0.1.0 (2012-06-12)
 ------------------
 
-- Created [jcbrand]
+* Created [jcbrand]