projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59c6588 c05a2a4)
Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 27 Sep 2009 11:28:45 +0000 (12:28 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 27 Sep 2009 11:28:45 +0000 (12:28 +0100)

Trivial merge