projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c23a5dc b861c8d)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 9 Nov 2015 21:56:32 +0000 (22:56 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 9 Nov 2015 21:56:32 +0000 (22:56 +0100)

Trivial merge