Software / code / prosody
Diff
util/watchdog.lua @ 7110:a2d096203b7f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 28 Jan 2016 15:11:33 +0100 |
| parent | 6777:5de6b93d0190 |
| child | 8555:4f0f5b49bb03 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 28 Jan 2016 15:11:33 +0100 |
| parent | 6777:5de6b93d0190 |
| child | 8555:4f0f5b49bb03 |