projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c39cc9 e580e1a)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 10 Aug 2014 08:31:18 +0000 (10:31 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 10 Aug 2014 08:31:18 +0000 (10:31 +0200)

Trivial merge