projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f2b53f 48d1448)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 19:40:38 +0000 (19:40 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 19:40:38 +0000 (19:40 +0000)

Trivial merge