projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 177d4dc 8f0edad)
Merge trunk/MattJ with trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 4 Jun 2010 13:08:40 +0000 (14:08 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 4 Jun 2010 13:08:40 +0000 (14:08 +0100)

Trivial merge