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

Trivial merge