aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-28 15:11:33 +0100
committerKim Alvefur <zash@zash.se>2016-01-28 15:11:33 +0100
commit3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b (patch)
treeb4f0b153db833962180e02e297b58bc1b73354ed /Makefile
parent3dd8fb807416165eb0b78a4c9c06e76e1f11c87f (diff)
parentaeba75d2f4582149a65437cdd6685b7188c4f984 (diff)
downloadprosody-3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b.tar.gz
prosody-3f0e7930eeeb4c2bfc5fffa6830b030716f81a2b.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions