diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-23 00:23:46 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-23 00:23:46 +0200 |
commit | 9ac3675494a9bf1c40781ef2c7954ba9c1993049 (patch) | |
tree | eb9fb622a0d716a1b827a9d7530a073ac57cb5ab /util/datamanager.lua | |
parent | 36661ad7ac28934b50b14c82c89f2be126da34d4 (diff) | |
parent | 6316aef5bb993b6d3c6d21d6a4068a540f8c816c (diff) | |
download | prosody-9ac3675494a9bf1c40781ef2c7954ba9c1993049.tar.gz prosody-9ac3675494a9bf1c40781ef2c7954ba9c1993049.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/datamanager.lua')
0 files changed, 0 insertions, 0 deletions