projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7624278 bd936bf)
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 13:54:37 +0000 (15:54 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 13:54:37 +0000 (15:54 +0200)

Trivial merge