projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fc46c4 fe5db5d)
Merge with 0.6
authorMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 19:58:58 +0000 (19:58 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 25 Nov 2009 19:58:58 +0000 (19:58 +0000)

Trivial merge