projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d673397 7275583)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 20 Mar 2013 20:34:38 +0000 (20:34 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 20 Mar 2013 20:34:38 +0000 (20:34 +0000)

Trivial merge