projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be38f07 cf1ee8e)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 21 Feb 2016 15:54:56 +0000 (16:54 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 21 Feb 2016 15:54:56 +0000 (16:54 +0100)

Trivial merge