aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-28 01:56:22 +0200
committerKim Alvefur <zash@zash.se>2014-09-28 01:56:22 +0200
commitdfd54e1aed80944b32680f9195bb1494a3469531 (patch)
treecfaf4c445383819dc32ada72c88e3f18079d9b30 /Makefile
parentbc2dc17d56a1a6f35177469c7122dfe577c3bf2c (diff)
parent55bacaf74f778f267bcf1f01c5c11caaa31ac671 (diff)
downloadprosody-dfd54e1aed80944b32680f9195bb1494a3469531.tar.gz
prosody-dfd54e1aed80944b32680f9195bb1494a3469531.zip
Merge 0.10->trunk
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions