diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-12-16 02:05:16 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-12-16 02:05:16 +0000 |
commit | 3cb94419f20cc327d4137b1f4751a27cfcf91ccc (patch) | |
tree | 0342a9d6cca7783cc788e35fcdb464b904cde942 /AUTHORS | |
parent | ad5bf650c75aa69e8f8168b3603ec0a787d9a26f (diff) | |
parent | 122b7f950dfaea345085c6e280dcd858914824e2 (diff) | |
download | prosody-3cb94419f20cc327d4137b1f4751a27cfcf91ccc.tar.gz prosody-3cb94419f20cc327d4137b1f4751a27cfcf91ccc.zip |
Merge with trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions