diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-20 14:46:27 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-20 14:46:27 +0100 |
commit | c17ba266422cfaaf595d51e7169868b10d0c455a (patch) | |
tree | 768406645ad3b21dc73929c51634ccca66acb7ae /Makefile | |
parent | d1035ccf21a3fcab0909b18cb46c782ee820f0b0 (diff) | |
parent | ea765c23848bb89db85b3240b8d3a94203160e18 (diff) | |
download | prosody-c17ba266422cfaaf595d51e7169868b10d0c455a.tar.gz prosody-c17ba266422cfaaf595d51e7169868b10d0c455a.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions