projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86fe40a 71e249f)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Tue, 3 Sep 2013 11:43:39 +0000 (13:43 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 3 Sep 2013 11:43:39 +0000 (13:43 +0200)

Trivial merge