projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 237fa41 2b21d9f)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 26 Mar 2016 13:54:39 +0000 (14:54 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 26 Mar 2016 13:54:39 +0000 (14:54 +0100)

Trivial merge