projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fc589b 98fab38)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 26 Apr 2015 22:03:14 +0000 (00:03 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 26 Apr 2015 22:03:14 +0000 (00:03 +0200)

Trivial merge