projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79a152b b814906)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 17:31:43 +0000 (19:31 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 17:31:43 +0000 (19:31 +0200)

Trivial merge