projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de5296c 734920b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 4 May 2015 23:34:20 +0000 (01:34 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 4 May 2015 23:34:20 +0000 (01:34 +0200)

Trivial merge