projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c78afc7 4b165d4)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 14:52:03 +0000 (16:52 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 14:52:03 +0000 (16:52 +0200)

Trivial merge