aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-07-24 21:50:38 +0200
committerKim Alvefur <zash@zash.se>2013-07-24 21:50:38 +0200
commit0f421f9b7ccbe92fb2bc50c3e576550866fbcea9 (patch)
treec0aecb236310c4962c4623ca3ce901dd2238f3d3 /prosody
parent935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab (diff)
parent14d72bec0f68fde660609ff40be1e9d86c543598 (diff)
downloadprosody-0f421f9b7ccbe92fb2bc50c3e576550866fbcea9.tar.gz
prosody-0f421f9b7ccbe92fb2bc50c3e576550866fbcea9.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions