Software / code / prosody
Diff
util/timer.lua @ 6847:c314e9142e9d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 24 Sep 2015 20:15:19 +0200 |
| parent | 6836:9f45f0fe5aef |
| child | 6930:58e260832334 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 24 Sep 2015 20:15:19 +0200 |
| parent | 6836:9f45f0fe5aef |
| child | 6930:58e260832334 |