projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b40a91 1137daf)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sun, 3 Feb 2013 14:52:27 +0000 (15:52 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 3 Feb 2013 14:52:27 +0000 (15:52 +0100)

Trivial merge