projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83ca7ad b4fd032)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 9 Aug 2013 14:03:48 +0000 (16:03 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 9 Aug 2013 14:03:48 +0000 (16:03 +0200)

Trivial merge