projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 392b51f 766b0d7)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:48:04 +0000 (19:48 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 30 Mar 2010 18:48:04 +0000 (19:48 +0100)

Trivial merge