projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2946c8f b6923f6)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 5 May 2010 10:25:26 +0000 (11:25 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 5 May 2010 10:25:26 +0000 (11:25 +0100)

Trivial merge