projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50096c7 453b432)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 17 Sep 2015 20:15:26 +0000 (22:15 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 17 Sep 2015 20:15:26 +0000 (22:15 +0200)

Trivial merge