projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb541b9 4178e70)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 23 Nov 2012 00:51:53 +0000 (01:51 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 23 Nov 2012 00:51:53 +0000 (01:51 +0100)

Trivial merge