projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db670c1 c1786d4)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 21 Apr 2014 00:43:38 +0000 (02:43 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 21 Apr 2014 00:43:38 +0000 (02:43 +0200)

Trivial merge