projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb6de69 5e3542f)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 5 Apr 2015 14:24:10 +0000 (16:24 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 5 Apr 2015 14:24:10 +0000 (16:24 +0200)

Trivial merge