projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e954007 52bea09)
Merge 0.9 -> trunk
authorKim Alvefur <zash@zash.se>
Sun, 14 Oct 2012 20:53:41 +0000 (22:53 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 14 Oct 2012 20:53:41 +0000 (22:53 +0200)

Trivial merge