projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 585a239 dab6d72)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 8 Apr 2016 15:54:50 +0000 (17:54 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 8 Apr 2016 15:54:50 +0000 (17:54 +0200)

Trivial merge