projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b48dbf2 eda4cb5)
Merge 0.7/MattJ with 0.7
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:57:01 +0000 (11:57 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 10:57:01 +0000 (11:57 +0100)

Trivial merge