projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 234cde3 b65aa7f)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 14:14:11 +0000 (15:14 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 14:14:11 +0000 (15:14 +0100)

Trivial merge