projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f54e7a 2812d8d)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 22 Apr 2014 22:23:46 +0000 (00:23 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 22 Apr 2014 22:23:46 +0000 (00:23 +0200)

Trivial merge