projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9f7e5c 6921c62)
Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 23 Nov 2009 16:30:34 +0000 (16:30 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 23 Nov 2009 16:30:34 +0000 (16:30 +0000)

Trivial merge