diff options
author | Kim Alvefur <zash@zash.se> | 2015-04-03 06:39:28 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-04-03 06:39:28 +0200 |
commit | 609d0795b4737b9bda5f5770507529a7f278808f (patch) | |
tree | 0ddb52bfa4a521df1e6ef7b9f54e3e3d615597a2 /AUTHORS | |
parent | 85acc757991e3a425e8d8cab4611c7c321dc8425 (diff) | |
parent | ea346342bd8e8677c0a5f36828fb2dfa812a0a89 (diff) | |
download | prosody-609d0795b4737b9bda5f5770507529a7f278808f.tar.gz prosody-609d0795b4737b9bda5f5770507529a7f278808f.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions