projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b894a26 df5e40b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 29 Mar 2016 13:38:14 +0000 (15:38 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 29 Mar 2016 13:38:14 +0000 (15:38 +0200)

Trivial merge