projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1ed1a7 190760b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 2 Oct 2015 10:13:32 +0000 (12:13 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 2 Oct 2015 10:13:32 +0000 (12:13 +0200)

Trivial merge