projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28bec28 24bf356)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:58:00 +0000 (11:58 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:58:00 +0000 (11:58 +0100)

Trivial merge