projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fea2a20 f6894d7)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:48:32 +0000 (23:48 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 9 Mar 2014 22:48:32 +0000 (23:48 +0100)

Trivial merge