projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 774d985 406981c)
Merge
authorKim Alvefur <zash@zash.se>
Wed, 13 May 2015 20:32:40 +0000 (22:32 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 May 2015 20:32:40 +0000 (22:32 +0200)

Trivial merge