projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4643eae a8b1552)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:41:43 +0000 (22:41 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:41:43 +0000 (22:41 +0000)

Trivial merge