projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba88455 655f2d8)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 22 May 2016 12:39:20 +0000 (14:39 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 22 May 2016 12:39:20 +0000 (14:39 +0200)

Trivial merge