projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba61196 1230b2c)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 31 Jan 2011 23:17:11 +0000 (23:17 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 31 Jan 2011 23:17:11 +0000 (23:17 +0000)

Trivial merge