projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10725ec a338441)
Merge with trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 6 Nov 2009 23:56:10 +0000 (23:56 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 6 Nov 2009 23:56:10 +0000 (23:56 +0000)

Trivial merge