# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1495065680 -7200
# Node ID 472219f85df6e7cb5c413490fd998a3c78a0384d
# Parent  5c91fb62338e1ad8cc7f9dc02b651daa2062cf55# Parent  d44c6582059d00dd48582493227578a3a530658e
Merge 0.10->trunk

diff -r 5c91fb62338e -r 472219f85df6 core/rostermanager.lua
--- a/core/rostermanager.lua	Wed May 17 01:06:20 2017 +0200
+++ b/core/rostermanager.lua	Thu May 18 02:01:20 2017 +0200
@@ -329,7 +329,7 @@
 		end
 	end
 	local success = (pending or is_subscribed) and save_roster(username, host, roster, jid);
-	return success, pending, subscribed;
+	return success, pending, is_subscribed;
 end
 
 local function process_outbound_subscription_request(username, host, jid)