Merge branch 'master' of github.com:jcbrand/converse.js

converse.js

@@ -4322,7 +4322,7 @@
                  */
                 var id = iq.getAttribute('id');
                 var from = iq.getAttribute('from');
-                if (from && from !== "" && from != converse.bare_jid) {
+                if (from && from !== "" && Strophe.getNodeFromJid(from) != converse.bare_jid) {
                     // Receiving client MUST ignore stanza unless it has no from or from = user's bare JID.
                     converse.connection.send(
                         $iq({type: 'error', id: id, from: converse.connection.jid})

docs/CHANGES.rst

@@ -6,6 +6,7 @@ Changelog
 
 * #462 Fix MUC rooms with names containing special characters not working [1st8]
 * #468 Fix [object Object] being sometimes shown as status [1st8]
+* #493 Roster wasn't being updated after a Roster push update [teseo, jcbrand]
 
 0.9.5 (2015-08-24)
 ------------------