projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c39914d 7422851)
Merge with Florob
authorMatthew Wild <mwild1@gmail.com>
Fri, 3 Jun 2011 04:36:44 +0000 (05:36 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 3 Jun 2011 04:36:44 +0000 (05:36 +0100)

Trivial merge