projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7845270 32a6828)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Mon, 22 Feb 2010 01:04:27 +0000 (01:04 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 22 Feb 2010 01:04:27 +0000 (01:04 +0000)

Trivial merge