projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 068dc23 8165c70)
Merge with 0.7
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Feb 2010 13:22:42 +0000 (13:22 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Feb 2010 13:22:42 +0000 (13:22 +0000)

Trivial merge