aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-20 15:00:52 +0100
committerKim Alvefur <zash@zash.se>2014-11-20 15:00:52 +0100
commitb32f290795cd6fa60cca8433399eec5fe561bbbc (patch)
treed923b1c2b876061a9845a8e92e394815218a487a /prosody
parent727c5935a8fefa27883a92ffc50e32c3b3d29e17 (diff)
parenta7d88ea2334bf18857b50cf7032ec3a3a79762fa (diff)
downloadprosody-b32f290795cd6fa60cca8433399eec5fe561bbbc.tar.gz
prosody-b32f290795cd6fa60cca8433399eec5fe561bbbc.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions