projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12b457b dcf4c0d)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 26 Aug 2015 11:17:37 +0000 (13:17 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 26 Aug 2015 11:17:37 +0000 (13:17 +0200)

Trivial merge