projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60e01b6 fcbcf2b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)

Trivial merge