diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:19:37 -0500 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-01-12 06:19:37 -0500 |
commit | e30c4203adcc8b814b80b9d7296aa3512b54c4ed (patch) | |
tree | 2f864bdfbd0f83069da90282c6891e5c62d5a0f7 /COPYING | |
parent | 7ca6c7391e4429585879f5c9a8d434e9c23b5f5f (diff) | |
parent | a4e581f96e34cfaba541d9091c949395bea4f913 (diff) | |
download | prosody-e30c4203adcc8b814b80b9d7296aa3512b54c4ed.tar.gz prosody-e30c4203adcc8b814b80b9d7296aa3512b54c4ed.zip |
Merge 0.9->0.10
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions