Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sun, 22 May 2016 12:39:14 +0000 (14:39 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 22 May 2016 12:39:14 +0000 (14:39 +0200)
1  2 
plugins/mod_presence.lua

Simple merge