projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45d601d 3ecbfc4)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 22 Nov 2014 10:53:14 +0000 (11:53 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 22 Nov 2014 10:53:14 +0000 (11:53 +0100)

Trivial merge