projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0100913 888a86b)
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Thu, 20 Nov 2014 14:00:52 +0000 (15:00 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 20 Nov 2014 14:00:52 +0000 (15:00 +0100)

Trivial merge