Software / code / prosody
Diff
net/server_event.lua @ 6342:379faad8ce9f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 09 Aug 2014 21:48:52 +0200 |
| parent | 6316:e144a1b67c30 |
| child | 6383:ec8878113907 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 09 Aug 2014 21:48:52 +0200 |
| parent | 6316:e144a1b67c30 |
| child | 6383:ec8878113907 |