projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 280435a c5aee3e)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 15 Apr 2014 18:36:39 +0000 (20:36 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 15 Apr 2014 18:36:39 +0000 (20:36 +0200)

Trivial merge