Software / code / prosody
Diff
util/events.lua @ 6571:4a864b6e8963
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 09 Feb 2015 00:48:08 +0100 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6638:9d2b56fd6b47 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 09 Feb 2015 00:48:08 +0100 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6638:9d2b56fd6b47 |