projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 548f3fe 889f84b)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 3 Feb 2014 06:25:05 +0000 (07:25 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 3 Feb 2014 06:25:05 +0000 (07:25 +0100)

Trivial merge