Diff

plugins/mod_presence.lua @ 5501:12a42421bede

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 19 Apr 2013 16:16:09 +0200 (2013-04-19)
parent 5416:0ba3a49d3863
child 5776:bd0ff8ae98a8
child 7430:ad0b15f253ee
line wrap: on
line diff