diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:32:46 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:32:46 +0100 |
commit | 163e1b4789466fe274179ab789a6dd435ef91700 (patch) | |
tree | a0564ac0d43d718d122652133cc4c3a5453f8995 /AUTHORS | |
parent | bd53859e5720ca585724a410c2af28b2156be206 (diff) | |
parent | 04bfcc280a54656435168beac16f65fc9e71acfc (diff) | |
download | prosody-163e1b4789466fe274179ab789a6dd435ef91700.tar.gz prosody-163e1b4789466fe274179ab789a6dd435ef91700.zip |
Merge with backout
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions