projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1505b14 41977f3)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 13 May 2015 22:24:21 +0000 (00:24 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 May 2015 22:24:21 +0000 (00:24 +0200)

Trivial merge