diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-12-10 18:58:30 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-12-10 18:58:30 +0000 |
commit | a6215475087bab66b80db99e23a530f5652d69d4 (patch) | |
tree | 6abe7e628961f73a7f0a5b15d5715ded3345a77a /Makefile | |
parent | dd37beeff9f229dee36da04d625d5200b69f945c (diff) | |
parent | 7f8d1c0995b51435b4d6a4f5c7a5d5ed7ab5d8e2 (diff) | |
download | prosody-a6215475087bab66b80db99e23a530f5652d69d4.tar.gz prosody-a6215475087bab66b80db99e23a530f5652d69d4.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions