diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-16 22:44:43 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-16 22:44:43 +0100 |
commit | f763095b66a53b0fcc73f21a99478deabebd2a5b (patch) | |
tree | bde7b68581a288e5d3fc8a036c80502296972394 /Makefile | |
parent | e49c053133ec90f007ba2f8575773f3cf5c20b54 (diff) | |
parent | 92a6c7fbd21fd445f3bdeca240030264b1756961 (diff) | |
download | prosody-f763095b66a53b0fcc73f21a99478deabebd2a5b.tar.gz prosody-f763095b66a53b0fcc73f21a99478deabebd2a5b.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions