projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc20191 c36630d)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 29 Jun 2013 20:49:56 +0000 (22:49 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 29 Jun 2013 20:49:56 +0000 (22:49 +0200)

Trivial merge