diff options
author | Kim Alvefur <zash@zash.se> | 2015-08-22 21:01:00 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-08-22 21:01:00 +0200 |
commit | 4625bd8f510121530cd4166338d39359ac739b3d (patch) | |
tree | a0c17c572b7a4b9677802bc11a2aa82bb460a502 /AUTHORS | |
parent | 837ae6f083fda4a93825dfa2abe00b2698d2134f (diff) | |
parent | 64813924883b2efa273a698aae32e602baa5028b (diff) | |
download | prosody-4625bd8f510121530cd4166338d39359ac739b3d.tar.gz prosody-4625bd8f510121530cd4166338d39359ac739b3d.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions