projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eff357f 4436e80)
Merge trunk with trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 16:44:37 +0000 (16:44 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sun, 21 Feb 2010 16:44:37 +0000 (16:44 +0000)

Trivial merge