diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-26 19:47:33 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-26 19:47:33 +0100 |
commit | 7e1a61f76b04981306d02759f4a8c07c8af9ea86 (patch) | |
tree | d70f10039b1ee0bdec5f010014db2fd1fe0b7b83 /Makefile | |
parent | a845ca47015583bf7b41f20362fd210c037639f3 (diff) | |
parent | e18117b8f9bffb05582ff610f0bd011d54a94c33 (diff) | |
download | prosody-7e1a61f76b04981306d02759f4a8c07c8af9ea86.tar.gz prosody-7e1a61f76b04981306d02759f4a8c07c8af9ea86.zip |
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions