projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d25b16 37b446c)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 12 Dec 2015 01:33:15 +0000 (02:33 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 12 Dec 2015 01:33:15 +0000 (02:33 +0100)

Trivial merge