projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1447874 bf50309)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 25 Mar 2014 18:18:32 +0000 (19:18 +0100)
committerKim Alvefur <zash@zash.se>
Tue, 25 Mar 2014 18:18:32 +0000 (19:18 +0100)

Trivial merge