aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-03 23:54:58 +0200
committerKim Alvefur <zash@zash.se>2014-04-03 23:54:58 +0200
commit35ef31bd9b827f325f17180dfa77a66578df0983 (patch)
treebbf44eb6a89b204b82f9fb9e256b1ab22c23aaa9 /prosody
parent499cb87234e01044440591b90c8eb46e63d1e01a (diff)
parent548ee2aa2b7df77d898c0058d0afa4e3fda6d5fb (diff)
downloadprosody-35ef31bd9b827f325f17180dfa77a66578df0983.tar.gz
prosody-35ef31bd9b827f325f17180dfa77a66578df0983.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions