# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1457976452 -3600
# Node ID 29eedc776bbd753f2133b5a0f560d8bee2168e1b
# Parent  8b5a9208c212a2477f8cf6bf93a9c654459f15c4# Parent  21da137d83b052164d1cd00dd5234a05c654b5fd
Merge 0.10->trunk

diff -r 8b5a9208c212 -r 29eedc776bbd plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Mon Mar 14 17:38:50 2016 +0100
+++ b/plugins/mod_presence.lua	Mon Mar 14 18:27:32 2016 +0100
@@ -27,7 +27,7 @@
 local rostermanager = require "core.rostermanager";
 local sessionmanager = require "core.sessionmanager";
 
-local recalc_resource_map = require "util.presencepriority".recalc_resource_map;
+local recalc_resource_map = require "util.presence".recalc_resource_map;
 
 local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false);