projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d673397 af03b21)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 16 Mar 2013 17:49:14 +0000 (18:49 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 16 Mar 2013 17:49:14 +0000 (18:49 +0100)

Trivial merge