projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd1c2bf 082b297)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 5 Apr 2016 10:48:36 +0000 (12:48 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 5 Apr 2016 10:48:36 +0000 (12:48 +0200)

Trivial merge