aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-03 23:49:15 +0200
committerKim Alvefur <zash@zash.se>2015-09-03 23:49:15 +0200
commit1f99ea3fcfdb4b39dea39bcac6f1ecbb4f77630b (patch)
tree00d541185816de24e7a9b1c8e9fa773bd53f8b8f /Makefile
parentd6e03dc82dfc3f5fa1787bda74195a994c113b79 (diff)
parentee7527ac00b9cf8f036b67066bbae060acc95629 (diff)
downloadprosody-1f99ea3fcfdb4b39dea39bcac6f1ecbb4f77630b.tar.gz
prosody-1f99ea3fcfdb4b39dea39bcac6f1ecbb4f77630b.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions