projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a193423 e381f15)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:12:16 +0000 (13:12 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:12:16 +0000 (13:12 +0200)

Trivial merge