diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-10 16:52:03 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-10 16:52:03 +0200 |
commit | e2fcce6523999eaee920c09ba1e1fa4bd0af3e08 (patch) | |
tree | 775860fdc145200d44619a577a34cc1ea83fda8f /util/watchdog.lua | |
parent | a415748985aa2ec998caabb5baf1d7f083d6076a (diff) | |
parent | 793af5630894999a11f2485c2162ff9ca1454799 (diff) | |
download | prosody-e2fcce6523999eaee920c09ba1e1fa4bd0af3e08.tar.gz prosody-e2fcce6523999eaee920c09ba1e1fa4bd0af3e08.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/watchdog.lua')
0 files changed, 0 insertions, 0 deletions