aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-07-13 18:43:28 +0200
committerKim Alvefur <zash@zash.se>2016-07-13 18:43:28 +0200
commit59fd8e3707ff2e70d90e285df366b47a25728928 (patch)
tree822d3ceb383f531a84eabd8c8f71cf58799d867b
parenta8523999b65f39d8a8a242f38bc825a5a6accd4d (diff)
parent451855fecb0e9000c9ac62df7be1eeaf4cdd97e9 (diff)
downloadprosody-59fd8e3707ff2e70d90e285df366b47a25728928.tar.gz
prosody-59fd8e3707ff2e70d90e285df366b47a25728928.zip
Merge 0.9->0.10
0 files changed, 0 insertions, 0 deletions