projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6f011d f6d29ba)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 25 May 2016 19:35:09 +0000 (21:35 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 25 May 2016 19:35:09 +0000 (21:35 +0200)

Trivial merge