projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd62339 fb932a9)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:11:45 +0000 (18:11 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 25 Sep 2015 16:11:45 +0000 (18:11 +0200)

Trivial merge