projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7890be7 fd16de2)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 26 Mar 2015 23:29:35 +0000 (00:29 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 26 Mar 2015 23:29:35 +0000 (00:29 +0100)

Trivial merge