projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2d1256 c05bf27)
Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:21 +0000 (14:24 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:21 +0000 (14:24 +0100)

Trivial merge