projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac707fa 3482c2a)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 18:53:17 +0000 (18:53 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 18:53:17 +0000 (18:53 +0000)

Trivial merge