projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bb2078 d907474)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:53 +0000 (14:24 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:53 +0000 (14:24 +0100)

Trivial merge