aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-03 07:23:33 +0100
committerKim Alvefur <zash@zash.se>2014-02-03 07:23:33 +0100
commit468a94a982d801d63812023fddb40baca2b9ef62 (patch)
tree8f9e7c6a07ec34aa279eca57118f12972e1b10f7 /core
parente6871e8492e10ce2d2096109a1652b497ded0351 (diff)
parent6b50bafcbdcd3e630d35f3dcf44cfae817589328 (diff)
downloadprosody-468a94a982d801d63812023fddb40baca2b9ef62.tar.gz
prosody-468a94a982d801d63812023fddb40baca2b9ef62.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions