projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ce7e30 2a8e217)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 11 Apr 2010 00:30:31 +0000 (01:30 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 11 Apr 2010 00:30:31 +0000 (01:30 +0100)

Trivial merge