projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b55fa49 a9b9016)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 6 Dec 2015 01:43:01 +0000 (02:43 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 6 Dec 2015 01:43:01 +0000 (02:43 +0100)

Trivial merge