projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c58d749 464233b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 15 Apr 2016 11:39:56 +0000 (13:39 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 15 Apr 2016 11:39:56 +0000 (13:39 +0200)

Trivial merge