aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-06-24 15:11:06 +0200
committerKim Alvefur <zash@zash.se>2016-06-24 15:11:06 +0200
commit03e138c59a2b3b26c9900f49f04c75bc4f203c53 (patch)
treeb8282e1f549aec3a4ab5458ecfd2807c03a0aed8
parent621ba250ff7f8e5502e1ebebcdbe38d26e5f62f2 (diff)
parent843d6bb62959582991aa6d0e095b383465bb7ec4 (diff)
downloadprosody-03e138c59a2b3b26c9900f49f04c75bc4f203c53.tar.gz
prosody-03e138c59a2b3b26c9900f49f04c75bc4f203c53.zip
Merge 0.9->0.10
0 files changed, 0 insertions, 0 deletions