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)
commit655f2d8751825c83db59c4f8370b724c03b8c310
tree153410d9e028f005fb94b510ed10f74da81f4d74
parentb5f5cf0745237982c6cee452eda556937134e57a
parentad0c5f51094470445db6e839842117e5a6b91ef0
Merge 0.9->0.10
plugins/mod_presence.lua