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 | 03e9d0f7d34af35b98cd15411872ee4d3c906837 (patch) | |
tree | 3720c0200aa7c43dbfcd804390a2a59fbb295f1f /AUTHORS | |
parent | 163e1b4789466fe274179ab789a6dd435ef91700 (diff) | |
parent | 5a95f10b210e59072916230230ee260eca3dd551 (diff) | |
download | prosody-03e9d0f7d34af35b98cd15411872ee4d3c906837.tar.gz prosody-03e9d0f7d34af35b98cd15411872ee4d3c906837.zip |
Merge with backout
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions