aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-02 22:33:11 +0200
committerKim Alvefur <zash@zash.se>2014-09-02 22:33:11 +0200
commitc80b30a71ceb555bb33d14c3c7dbee0a8c93eaee (patch)
treeb4ffbcba45331b7fa86a9e1d1881e94b8fef9d42 /prosody
parenta540fdb9f448eb0990899b70e0ed8ab926e979f6 (diff)
parent69d97b4f7ed15249ce71a5b261bff98a008684aa (diff)
downloadprosody-c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee.tar.gz
prosody-c80b30a71ceb555bb33d14c3c7dbee0a8c93eaee.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions