projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f52971 baf4260)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 21:05:27 +0000 (23:05 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 21:05:27 +0000 (23:05 +0200)

Trivial merge