projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce30d54 8c2cd3c)
Merge
authorMatthew Wild <mwild1@gmail.com>
Sat, 14 Mar 2009 16:05:22 +0000 (16:05 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 14 Mar 2009 16:05:22 +0000 (16:05 +0000)

Trivial merge