projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce1cdda 150677b)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 2 Jun 2010 20:34:16 +0000 (21:34 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 2 Jun 2010 20:34:16 +0000 (21:34 +0100)

Trivial merge