diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:45:36 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-05-11 01:45:36 +0100 |
commit | 205fa926e72483b3d981d96915df59aa9b800b9f (patch) | |
tree | 3720c0200aa7c43dbfcd804390a2a59fbb295f1f /AUTHORS | |
parent | 38a7865229c7049bcbfa3e7f78016bf5e988ca28 (diff) | |
parent | 839f988ea4545677a5927f933927b3bac616f8ad (diff) | |
download | prosody-205fa926e72483b3d981d96915df59aa9b800b9f.tar.gz prosody-205fa926e72483b3d981d96915df59aa9b800b9f.zip |
Merge with backout
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions