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
commit7b0ac21c1166bf2b897cff3880a7140dcec0fd24 (patch)
treeb4f0b153db833962180e02e297b58bc1b73354ed /Makefile
parentfcf557af0bdcd02b9ff50cd545e2bf5e2d7c34a1 (diff)
parentdc8c136359eaa5ca322f9a04ac0aca14c6330f5b (diff)
downloadprosody-7b0ac21c1166bf2b897cff3880a7140dcec0fd24.tar.gz
prosody-7b0ac21c1166bf2b897cff3880a7140dcec0fd24.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions