projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50f4c7e 17726d2)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 19 Feb 2014 22:45:24 +0000 (23:45 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 19 Feb 2014 22:45:24 +0000 (23:45 +0100)

Trivial merge