projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13e2602 7b520ca)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 02:03:56 +0000 (03:03 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 02:03:56 +0000 (03:03 +0100)

Trivial merge