aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-06 10:48:41 +0100
committerKim Alvefur <zash@zash.se>2014-02-06 10:48:41 +0100
commit73f394eec544993923ba0b1bbd4eed78051bd59f (patch)
tree0a2c2d79ebad44f4db7d05553885ff5a21a079e7 /prosody
parentc92bbefd9c5e36913afe0d796a84df180faaf0af (diff)
parentf41583535f4541adbc1356e5212fc47a1a4abdcc (diff)
downloadprosody-73f394eec544993923ba0b1bbd4eed78051bd59f.tar.gz
prosody-73f394eec544993923ba0b1bbd4eed78051bd59f.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions