aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-02-18 13:24:21 +0000
committerMatthew Wild <mwild1@gmail.com>2016-02-18 13:24:21 +0000
commit7e0b29e4e26c0c1f0403f79e85bbb377035502bf (patch)
treee58bdeea676840f3fe75618c1d1516448ddc431b /prosody
parentca7a512e35b8522ada592f14ac375329ab786a30 (diff)
parent952ba43fea2d02b6a6f077274e869280288a87cd (diff)
downloadprosody-7e0b29e4e26c0c1f0403f79e85bbb377035502bf.tar.gz
prosody-7e0b29e4e26c0c1f0403f79e85bbb377035502bf.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions