projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 986fa60 a14deb1)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 26 Sep 2015 22:37:18 +0000 (00:37 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 26 Sep 2015 22:37:18 +0000 (00:37 +0200)

Trivial merge