projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 272ab30 260141c)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:21:05 +0000 (16:21 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:21:05 +0000 (16:21 +0100)

Trivial merge