projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9186d66 66bf0a6)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 23 Mar 2013 03:17:39 +0000 (04:17 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 23 Mar 2013 03:17:39 +0000 (04:17 +0100)

Trivial merge