projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 617cf36 6559784)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 19 Feb 2014 19:10:23 +0000 (20:10 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 19 Feb 2014 19:10:23 +0000 (20:10 +0100)

Trivial merge