projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12cc943 b62dc0e)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 16 Jan 2016 21:44:43 +0000 (22:44 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 16 Jan 2016 21:44:43 +0000 (22:44 +0100)

Trivial merge