projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 300378b d431090)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 10 Sep 2014 23:17:56 +0000 (01:17 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 10 Sep 2014 23:17:56 +0000 (01:17 +0200)

Trivial merge