aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-10-18 19:07:55 +0200
committerKim Alvefur <zash@zash.se>2016-10-18 19:07:55 +0200
commitf1c2f29484997c0a953a248241768df1c3736df5 (patch)
treea7bd7a664b80ac2d321bef9ef2e7a465e32982a5 /core
parentda9ff7d218486105eb2e529cfe8e22346aa53430 (diff)
parent5bbd2aa2ff4137e9dc7b47ee76723319cbfc75dc (diff)
downloadprosody-f1c2f29484997c0a953a248241768df1c3736df5.tar.gz
prosody-f1c2f29484997c0a953a248241768df1c3736df5.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions