projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31a137a fe00476)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:48:12 +0000 (22:48 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 24 Mar 2010 22:48:12 +0000 (22:48 +0000)

Trivial merge