Software / code / prosody
Diff
util/watchdog.lua @ 6284:b49540983320
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:21 +0200 |
| parent | 4891:189cfe565d03 |
| child | 6777:5de6b93d0190 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:21 +0200 |
| parent | 4891:189cfe565d03 |
| child | 6777:5de6b93d0190 |