diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:48:28 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-07-08 18:48:28 +0100 |
commit | 28df9086d844e7a8ca6f26b55fe6297e044e7be7 (patch) | |
tree | 03f7a2da185371615ec7ca54b84c5f0aaafec986 /AUTHORS | |
parent | 364fd6915460a12a2fcdcee972da836ba0244e5a (diff) | |
parent | ff4d31cd03974874de3ea7d0d09ccc852aee4531 (diff) | |
download | prosody-28df9086d844e7a8ca6f26b55fe6297e044e7be7.tar.gz prosody-28df9086d844e7a8ca6f26b55fe6297e044e7be7.zip |
Merge with backout
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions