projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28e5e08 7de0844)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 15 Dec 2012 04:35:43 +0000 (05:35 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 15 Dec 2012 04:35:43 +0000 (05:35 +0100)

Trivial merge