projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2569be4 e6f2339)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 5 May 2014 22:37:08 +0000 (00:37 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 5 May 2014 22:37:08 +0000 (00:37 +0200)

Trivial merge