diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
commit | 669449342ff7f72b94149861c8dbf156d0343e1a (patch) | |
tree | 4c56350b49c07b9ab63a705fc167339ef54dca96 /Makefile | |
parent | e6fa5c423772e1c379abaeff6f35ba2e1e5153af (diff) | |
parent | be752a7c9ef957cc05b83941ff5be1971312b171 (diff) | |
download | prosody-669449342ff7f72b94149861c8dbf156d0343e1a.tar.gz prosody-669449342ff7f72b94149861c8dbf156d0343e1a.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions