diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-06-13 23:24:36 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-06-13 23:24:36 +0100 |
| commit | eb2837ec6dda62615b65af213847abaf859d752a (patch) | |
| tree | 79ee0e0fb16935e5bccc66437d2064837668f111 /COPYING | |
| parent | ff224e953c0e4ca7ed515d59afb1f0d8db06298d (diff) | |
| parent | ee47583ffba1c0c823afbc0943951617356800e6 (diff) | |
| download | prosody-eb2837ec6dda62615b65af213847abaf859d752a.tar.gz prosody-eb2837ec6dda62615b65af213847abaf859d752a.zip | |
Merge the merge
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions