projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fd4bd1 1d520b8)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 16:04:35 +0000 (16:04 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 1 Mar 2010 16:04:35 +0000 (16:04 +0000)

Trivial merge