projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1660fff 2c930e1)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 3 Apr 2015 04:39:28 +0000 (06:39 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 3 Apr 2015 04:39:28 +0000 (06:39 +0200)

Trivial merge