diff options
author | Kim Alvefur <zash@zash.se> | 2014-11-20 15:01:47 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-11-20 15:01:47 +0100 |
commit | c69740e713d4ed2466cd55ea2cb137cb7334a7bf (patch) | |
tree | 1942217f4c99d9e88151d983acabdd514ac04386 /AUTHORS | |
parent | 82dd57de00dd40bd2eace8089752e657fb577f23 (diff) | |
parent | b32f290795cd6fa60cca8433399eec5fe561bbbc (diff) | |
download | prosody-c69740e713d4ed2466cd55ea2cb137cb7334a7bf.tar.gz prosody-c69740e713d4ed2466cd55ea2cb137cb7334a7bf.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions