aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-10 07:57:58 +0100
committerKim Alvefur <zash@zash.se>2016-02-10 07:57:58 +0100
commitca7a512e35b8522ada592f14ac375329ab786a30 (patch)
treec39d1e6bfacafa23202f13f21ec1da1a44b2f2b4 /prosody
parentbee4aa35ce6c7da81c5c563ef5b08d8188af8451 (diff)
parentf856a201b70f1cbacb1d9715d44a6ab442a7fa06 (diff)
downloadprosody-ca7a512e35b8522ada592f14ac375329ab786a30.tar.gz
prosody-ca7a512e35b8522ada592f14ac375329ab786a30.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions