projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1101441 73609fc)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 21 Jun 2014 13:05:52 +0000 (15:05 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 21 Jun 2014 13:05:52 +0000 (15:05 +0200)

Trivial merge