projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e190b6f 8a0e5ce)
Merge darkrain->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Mar 2010 01:31:37 +0000 (01:31 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Mar 2010 01:31:37 +0000 (01:31 +0000)

Trivial merge