projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 484a454 e39ca2e)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sun, 16 Dec 2012 13:36:44 +0000 (14:36 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 16 Dec 2012 13:36:44 +0000 (14:36 +0100)

Trivial merge