aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-06-25 18:57:43 +0200
committerKim Alvefur <zash@zash.se>2015-06-25 18:57:43 +0200
commit21aa02fd1b769ae89fccfd2cd84756f918e2f152 (patch)
tree1b0aa90c356c8219e4165bd4d5136ea99b34e8f1 /Makefile
parent20b57f7f016e907cf3d89793f5c57aaeff0b630f (diff)
parentb460e6d47f28382d21c8914abbd75c1b21b38158 (diff)
downloadprosody-21aa02fd1b769ae89fccfd2cd84756f918e2f152.tar.gz
prosody-21aa02fd1b769ae89fccfd2cd84756f918e2f152.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions