projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05eee4d 92eedf5)
Merge Florob->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 16 Jul 2010 15:53:54 +0000 (16:53 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 16 Jul 2010 15:53:54 +0000 (16:53 +0100)

Trivial merge