projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc58c74 e31e045)
Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 1 Dec 2009 19:57:54 +0000 (19:57 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 1 Dec 2009 19:57:54 +0000 (19:57 +0000)

Trivial merge