projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 478870e 7eb15e3)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 22 Mar 2013 15:16:43 +0000 (15:16 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 22 Mar 2013 15:16:43 +0000 (15:16 +0000)

Trivial merge