projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3de45a6 5cadbff)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 22 Aug 2015 19:01:00 +0000 (21:01 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 22 Aug 2015 19:01:00 +0000 (21:01 +0200)

Trivial merge