projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b9d4b7 80433ad)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:22:43 +0000 (22:22 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:22:43 +0000 (22:22 +0100)

Trivial merge